Now that the function data is embedded with the function, there is no need to carry a device state variable.
Signed-off-by: Jon Derrick <[email protected]> --- block/sed-opal.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/block/sed-opal.c b/block/sed-opal.c index e2e3228..791a40a 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -85,7 +85,6 @@ struct opal_dev { sec_send_recv *send_recv; opal_step *funcs; - int state; struct mutex dev_lock; u16 comid; u32 hsn; @@ -377,17 +376,17 @@ static void check_geometry(struct opal_dev *dev, const void *data) static int next(struct opal_dev *dev) { opal_step *func; - int error = 0; + int state = 0, error = 0; do { - func = &dev->funcs[dev->state]; + func = &dev->funcs[state]; if (!func->fn) break; error = func->fn(dev, func->data); if (error) { pr_err("Error on step function: %d with error %d: %s\n", - dev->state, error, + state, error, opal_error_to_human(error)); /* For each OPAL command we do a discovery0 then we @@ -397,10 +396,10 @@ static int next(struct opal_dev *dev) * session. Therefore we shouldn't attempt to terminate * a session, as one has not yet been created. */ - if (dev->state > 1) + if (state > 1) return end_opal_session_error(dev); } - dev->state++; + state++; } while (!error); return error; @@ -1967,14 +1966,12 @@ static int end_opal_session_error(struct opal_dev *dev) { NULL, } }; dev->funcs = error_end_session; - dev->state = 0; return next(dev); } static inline void setup_opal_dev(struct opal_dev *dev, opal_step *funcs) { - dev->state = 0; dev->funcs = funcs; dev->tsn = 0; dev->hsn = 0; @@ -2320,7 +2317,6 @@ bool opal_unlock_from_suspend(struct opal_dev *dev) setup_opal_dev(dev, NULL); list_for_each_entry(suspend, &dev->unlk_lst, node) { - dev->state = 0; dev->tsn = 0; dev->hsn = 0; -- 1.8.3.1
