Looks good Reviewed-by: Jon Derrick <[email protected]>
On Fri, 2019-02-01 at 21:50 +0100, David Kozub wrote: > As the function is responsible for executing the individual steps supplied > in the steps argument, execute_steps is a more descriptive name than the > rather generic next. > > Signed-off-by: David Kozub <[email protected]> > Reviewed-by: Scott Bauer <[email protected]> > --- > block/sed-opal.c | 37 +++++++++++++++++++------------------ > 1 file changed, 19 insertions(+), 18 deletions(-) > > diff --git a/block/sed-opal.c b/block/sed-opal.c > index 3362741dd198..c09149dd5e0a 100644 > --- a/block/sed-opal.c > +++ b/block/sed-opal.c > @@ -401,8 +401,8 @@ static int execute_step(struct opal_dev *dev, > return error; > } > > -static int next(struct opal_dev *dev, const struct opal_step *steps, > - size_t n_steps) > +static int execute_steps(struct opal_dev *dev, > + const struct opal_step *steps, size_t n_steps) > { > size_t state; > int error; > @@ -2034,7 +2034,7 @@ static int opal_secure_erase_locking_range(struct > opal_dev *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, erase_steps, ARRAY_SIZE(erase_steps)); > + ret = execute_steps(dev, erase_steps, ARRAY_SIZE(erase_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2051,7 +2051,7 @@ static int opal_erase_locking_range(struct opal_dev > *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, erase_steps, ARRAY_SIZE(erase_steps)); > + ret = execute_steps(dev, erase_steps, ARRAY_SIZE(erase_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2077,7 +2077,7 @@ static int opal_enable_disable_shadow_mbr(struct > opal_dev *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); > + ret = execute_steps(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2099,7 +2099,7 @@ static int opal_mbr_status(struct opal_dev *dev, struct > opal_mbr_data *opal_mbr) > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); > + ret = execute_steps(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2122,7 +2122,7 @@ static int opal_write_shadow_mbr(struct opal_dev *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); > + ret = execute_steps(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2174,7 +2174,7 @@ static int opal_add_user_to_lr(struct opal_dev *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, steps, ARRAY_SIZE(steps)); > + ret = execute_steps(dev, steps, ARRAY_SIZE(steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2189,7 +2189,7 @@ static int opal_reverttper(struct opal_dev *dev, struct > opal_key *opal) > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, revert_steps, ARRAY_SIZE(revert_steps)); > + ret = execute_steps(dev, revert_steps, ARRAY_SIZE(revert_steps)); > mutex_unlock(&dev->dev_lock); > > /* > @@ -2217,10 +2217,11 @@ static int __opal_lock_unlock(struct opal_dev *dev, > }; > > if (lk_unlk->session.sum) > - return next(dev, unlock_sum_steps, > - ARRAY_SIZE(unlock_sum_steps)); > + return execute_steps(dev, unlock_sum_steps, > + ARRAY_SIZE(unlock_sum_steps)); > else > - return next(dev, unlock_steps, ARRAY_SIZE(unlock_steps)); > + return execute_steps(dev, unlock_steps, > + ARRAY_SIZE(unlock_steps)); > } > > static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key) > @@ -2232,7 +2233,7 @@ static int __opal_set_mbr_done(struct opal_dev *dev, > struct opal_key *key) > { end_opal_session, } > }; > > - return next(dev, mbrdone_step, ARRAY_SIZE(mbrdone_step)); > + return execute_steps(dev, mbrdone_step, ARRAY_SIZE(mbrdone_step)); > } > > static int opal_lock_unlock(struct opal_dev *dev, > @@ -2267,7 +2268,7 @@ static int opal_take_ownership(struct opal_dev *dev, > struct opal_key *opal) > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, owner_steps, ARRAY_SIZE(owner_steps)); > + ret = execute_steps(dev, owner_steps, ARRAY_SIZE(owner_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2288,7 +2289,7 @@ static int opal_activate_lsp(struct opal_dev *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, active_steps, ARRAY_SIZE(active_steps)); > + ret = execute_steps(dev, active_steps, ARRAY_SIZE(active_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2305,7 +2306,7 @@ static int opal_setup_locking_range(struct opal_dev > *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, lr_steps, ARRAY_SIZE(lr_steps)); > + ret = execute_steps(dev, lr_steps, ARRAY_SIZE(lr_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2327,7 +2328,7 @@ static int opal_set_new_pw(struct opal_dev *dev, struct > opal_new_pw *opal_pw) > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, pw_steps, ARRAY_SIZE(pw_steps)); > + ret = execute_steps(dev, pw_steps, ARRAY_SIZE(pw_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > } > @@ -2351,7 +2352,7 @@ static int opal_activate_user(struct opal_dev *dev, > > mutex_lock(&dev->dev_lock); > setup_opal_dev(dev); > - ret = next(dev, act_steps, ARRAY_SIZE(act_steps)); > + ret = execute_steps(dev, act_steps, ARRAY_SIZE(act_steps)); > mutex_unlock(&dev->dev_lock); > return ret; > }
smime.p7s
Description: S/MIME cryptographic signature
