block/sed: Embed function data into the function sequence

By embedding the function data with the function sequence, we can
eliminate the external function data and state variable code. It also
made obvious some other small cleanups.

Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Reviewed-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 163 insertions, 255 deletions

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 4fc4d7b441d5..893557554cc5 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -34,7 +34,11 @@
 #define IO_BUFFER_LENGTH 2048
 #define MAX_TOKS 64
 
-typedef int (*opal_step)(struct opal_dev *dev);
+struct opal_step {
+        int (*fn)(struct opal_dev *dev, void *data);
+        void *data;
+};
+typedef int (cont_fn)(struct opal_dev *dev);
 
 enum opal_atom_width {
         OPAL_WIDTH_TINY,
@@ -80,9 +84,7 @@ struct opal_dev {
         void *data;
         sec_send_recv *send_recv;
 
-        const opal_step *funcs;
-        void **func_data;
-        int state;
+        const struct opal_step *steps;
         struct mutex dev_lock;
         u16 comid;
         u32 hsn;
@@ -213,8 +215,6 @@ static const u8 opalmethod[][OPAL_UID_LENGTH] = {
                 { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x08, 0x03 },
 };
 
-typedef int (cont_fn)(struct opal_dev *dev);
-
 static int end_opal_session_error(struct opal_dev *dev);
 
 struct opal_suspend_data {
@@ -375,18 +375,18 @@ static void check_geometry(struct opal_dev *dev, const void *data)
 
 static int next(struct opal_dev *dev)
 {
-        opal_step func;
-        int error = 0;
+        const struct opal_step *step;
+        int state = 0, error = 0;
 
         do {
-                func = dev->funcs[dev->state];
-                if (!func)
+                step = &dev->steps[state];
+                if (!step->fn)
                         break;
 
-                error = func(dev);
+                error = step->fn(dev, step->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
@@ -396,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;
@@ -483,7 +483,7 @@ static int opal_discovery0_end(struct opal_dev *dev)
         return 0;
 }
 
-static int opal_discovery0(struct opal_dev *dev)
+static int opal_discovery0(struct opal_dev *dev, void *data)
 {
         int ret;
 
@@ -1018,7 +1018,7 @@ static int finalize_and_send(struct opal_dev *dev, cont_fn cont)
         return opal_send_recv(dev, cont);
 }
 
-static int gen_key(struct opal_dev *dev)
+static int gen_key(struct opal_dev *dev, void *data)
 {
         const u8 *method;
         u8 uid[OPAL_UID_LENGTH];
@@ -1072,15 +1072,14 @@ static int get_active_key_cont(struct opal_dev *dev)
         return 0;
 }
 
-static int get_active_key(struct opal_dev *dev)
+static int get_active_key(struct opal_dev *dev, void *data)
 {
         u8 uid[OPAL_UID_LENGTH];
         int err = 0;
-        u8 *lr;
+        u8 *lr = data;
 
         clear_opal_cmd(dev);
         set_comid(dev, dev->comid);
-        lr = dev->func_data[dev->state];
 
         err = build_locking_range(uid, sizeof(uid), *lr);
         if (err)
@@ -1163,17 +1162,16 @@ static inline int enable_global_lr(struct opal_dev *dev, u8 *uid,
         return err;
 }
 
-static int setup_locking_range(struct opal_dev *dev)
+static int setup_locking_range(struct opal_dev *dev, void *data)
 {
         u8 uid[OPAL_UID_LENGTH];
-        struct opal_user_lr_setup *setup;
+        struct opal_user_lr_setup *setup = data;
         u8 lr;
         int err = 0;
 
         clear_opal_cmd(dev);
         set_comid(dev, dev->comid);
 
-        setup = dev->func_data[dev->state];
         lr = setup->session.opal_key.lr;
         err = build_locking_range(uid, sizeof(uid), lr);
         if (err)
@@ -1286,20 +1284,19 @@ static int start_generic_opal_session(struct opal_dev *dev,
         return finalize_and_send(dev, start_opal_session_cont);
 }
 
-static int start_anybodyASP_opal_session(struct opal_dev *dev)
+static int start_anybodyASP_opal_session(struct opal_dev *dev, void *data)
 {
         return start_generic_opal_session(dev, OPAL_ANYBODY_UID,
                                           OPAL_ADMINSP_UID, NULL, 0);
 }
 
-static int start_SIDASP_opal_session(struct opal_dev *dev)
+static int start_SIDASP_opal_session(struct opal_dev *dev, void *data)
 {
         int ret;
         const u8 *key = dev->prev_data;
-        struct opal_key *okey;
 
         if (!key) {
-                okey = dev->func_data[dev->state];
+                const struct opal_key *okey = data;
                 ret = start_generic_opal_session(dev, OPAL_SID_UID,
                                                  OPAL_ADMINSP_UID,
                                                  okey->key,
@@ -1314,22 +1311,21 @@ static int start_SIDASP_opal_session(struct opal_dev *dev)
         return ret;
 }
 
-static inline int start_admin1LSP_opal_session(struct opal_dev *dev)
+static int start_admin1LSP_opal_session(struct opal_dev *dev, void *data)
 {
-        struct opal_key *key = dev->func_data[dev->state];
-
+        struct opal_key *key = data;
         return start_generic_opal_session(dev, OPAL_ADMIN1_UID,
                                           OPAL_LOCKINGSP_UID,
                                           key->key, key->key_len);
 }
 
-static int start_auth_opal_session(struct opal_dev *dev)
+static int start_auth_opal_session(struct opal_dev *dev, void *data)
 {
+        struct opal_session_info *session = data;
         u8 lk_ul_user[OPAL_UID_LENGTH];
+        size_t keylen = session->opal_key.key_len;
         int err = 0;
 
-        struct opal_session_info *session = dev->func_data[dev->state];
-        size_t keylen = session->opal_key.key_len;
         u8 *key = session->opal_key.key;
         u32 hsn = GENERIC_HOST_SESSION_NUM;
 
@@ -1379,7 +1375,7 @@ static int start_auth_opal_session(struct opal_dev *dev)
         return finalize_and_send(dev, start_opal_session_cont);
 }
 
-static int revert_tper(struct opal_dev *dev)
+static int revert_tper(struct opal_dev *dev, void *data)
 {
         int err = 0;
 
@@ -1401,9 +1397,9 @@ static int revert_tper(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int internal_activate_user(struct opal_dev *dev)
+static int internal_activate_user(struct opal_dev *dev, void *data)
 {
-        struct opal_session_info *session = dev->func_data[dev->state];
+        struct opal_session_info *session = data;
         u8 uid[OPAL_UID_LENGTH];
         int err = 0;
 
@@ -1436,15 +1432,14 @@ static int internal_activate_user(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int erase_locking_range(struct opal_dev *dev)
+static int erase_locking_range(struct opal_dev *dev, void *data)
 {
-        struct opal_session_info *session;
+        struct opal_session_info *session = data;
         u8 uid[OPAL_UID_LENGTH];
         int err = 0;
 
         clear_opal_cmd(dev);
         set_comid(dev, dev->comid);
-        session = dev->func_data[dev->state];
 
         if (build_locking_range(uid, sizeof(uid), session->opal_key.lr) < 0)
                 return -ERANGE;
@@ -1463,9 +1458,9 @@ static int erase_locking_range(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int set_mbr_done(struct opal_dev *dev)
+static int set_mbr_done(struct opal_dev *dev, void *data)
 {
-        u8 mbr_done_tf = *(u8 *)dev->func_data[dev->state];
+        u8 *mbr_done_tf = data;
         int err = 0;
 
         clear_opal_cmd(dev);
@@ -1481,7 +1476,7 @@ static int set_mbr_done(struct opal_dev *dev)
         add_token_u8(&err, dev, OPAL_STARTLIST);
         add_token_u8(&err, dev, OPAL_STARTNAME);
         add_token_u8(&err, dev, 2); /* Done */
-        add_token_u8(&err, dev, mbr_done_tf); /* Done T or F */
+        add_token_u8(&err, dev, *mbr_done_tf); /* Done T or F */
         add_token_u8(&err, dev, OPAL_ENDNAME);
         add_token_u8(&err, dev, OPAL_ENDLIST);
         add_token_u8(&err, dev, OPAL_ENDNAME);
@@ -1495,9 +1490,9 @@ static int set_mbr_done(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int set_mbr_enable_disable(struct opal_dev *dev)
+static int set_mbr_enable_disable(struct opal_dev *dev, void *data)
 {
-        u8 mbr_en_dis = *(u8 *)dev->func_data[dev->state];
+        u8 *mbr_en_dis = data;
         int err = 0;
 
         clear_opal_cmd(dev);
@@ -1513,7 +1508,7 @@ static int set_mbr_enable_disable(struct opal_dev *dev)
         add_token_u8(&err, dev, OPAL_STARTLIST);
         add_token_u8(&err, dev, OPAL_STARTNAME);
         add_token_u8(&err, dev, 1);
-        add_token_u8(&err, dev, mbr_en_dis);
+        add_token_u8(&err, dev, *mbr_en_dis);
         add_token_u8(&err, dev, OPAL_ENDNAME);
         add_token_u8(&err, dev, OPAL_ENDLIST);
         add_token_u8(&err, dev, OPAL_ENDNAME);
@@ -1554,11 +1549,10 @@ static int generic_pw_cmd(u8 *key, size_t key_len, u8 *cpin_uid,
         return err;
 }
 
-static int set_new_pw(struct opal_dev *dev)
+static int set_new_pw(struct opal_dev *dev, void *data)
 {
         u8 cpin_uid[OPAL_UID_LENGTH];
-        struct opal_session_info *usr = dev->func_data[dev->state];
-
+        struct opal_session_info *usr = data;
 
         memcpy(cpin_uid, opaluid[OPAL_C_PIN_ADMIN1], OPAL_UID_LENGTH);
 
@@ -1579,10 +1573,10 @@ static int set_new_pw(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int set_sid_cpin_pin(struct opal_dev *dev)
+static int set_sid_cpin_pin(struct opal_dev *dev, void *data)
 {
         u8 cpin_uid[OPAL_UID_LENGTH];
-        struct opal_key *key = dev->func_data[dev->state];
+        struct opal_key *key = data;
 
         memcpy(cpin_uid, opaluid[OPAL_C_PIN_SID], OPAL_UID_LENGTH);
 
@@ -1593,18 +1587,16 @@ static int set_sid_cpin_pin(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int add_user_to_lr(struct opal_dev *dev)
+static int add_user_to_lr(struct opal_dev *dev, void *data)
 {
         u8 lr_buffer[OPAL_UID_LENGTH];
         u8 user_uid[OPAL_UID_LENGTH];
-        struct opal_lock_unlock *lkul;
+        struct opal_lock_unlock *lkul = data;
         int err = 0;
 
         clear_opal_cmd(dev);
         set_comid(dev, dev->comid);
 
-        lkul = dev->func_data[dev->state];
-
         memcpy(lr_buffer, opaluid[OPAL_LOCKINGRANGE_ACE_RDLOCKED],
                OPAL_UID_LENGTH);
 
@@ -1671,11 +1663,11 @@ static int add_user_to_lr(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int lock_unlock_locking_range(struct opal_dev *dev)
+static int lock_unlock_locking_range(struct opal_dev *dev, void *data)
 {
         u8 lr_buffer[OPAL_UID_LENGTH];
         const u8 *method;
-        struct opal_lock_unlock *lkul;
+        struct opal_lock_unlock *lkul = data;
         u8 read_locked = 1, write_locked = 1;
         int err = 0;
 
@@ -1683,7 +1675,6 @@ static int lock_unlock_locking_range(struct opal_dev *dev)
         set_comid(dev, dev->comid);
 
         method = opalmethod[OPAL_SET];
-        lkul = dev->func_data[dev->state];
         if (build_locking_range(lr_buffer, sizeof(lr_buffer),
                                 lkul->session.opal_key.lr) < 0)
                 return -ERANGE;
@@ -1735,19 +1726,18 @@ static int lock_unlock_locking_range(struct opal_dev *dev)
 }
 
 
-static int lock_unlock_locking_range_sum(struct opal_dev *dev)
+static int lock_unlock_locking_range_sum(struct opal_dev *dev, void *data)
 {
         u8 lr_buffer[OPAL_UID_LENGTH];
         u8 read_locked = 1, write_locked = 1;
         const u8 *method;
-        struct opal_lock_unlock *lkul;
+        struct opal_lock_unlock *lkul = data;
         int ret;
 
         clear_opal_cmd(dev);
         set_comid(dev, dev->comid);
 
         method = opalmethod[OPAL_SET];
-        lkul = dev->func_data[dev->state];
         if (build_locking_range(lr_buffer, sizeof(lr_buffer),
                                 lkul->session.opal_key.lr) < 0)
                 return -ERANGE;
@@ -1778,9 +1768,9 @@ static int lock_unlock_locking_range_sum(struct opal_dev *dev)
         return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int activate_lsp(struct opal_dev *dev)
+static int activate_lsp(struct opal_dev *dev, void *data)
 {
-        struct opal_lr_act *opal_act;
+        struct opal_lr_act *opal_act = data;
         u8 user_lr[OPAL_UID_LENGTH];
         u8 uint_3 = 0x83;
         int err = 0, i;
@@ -1788,8 +1778,6 @@ static int activate_lsp(struct opal_dev *dev)
         clear_opal_cmd(dev);
         set_comid(dev, dev->comid);
 
-        opal_act = dev->func_data[dev->state];
-
         add_token_u8(&err, dev, OPAL_CALL);
         add_token_bytestring(&err, dev, opaluid[OPAL_LOCKINGSP_UID],
                              OPAL_UID_LENGTH);
@@ -1854,7 +1842,7 @@ static int get_lsp_lifecycle_cont(struct opal_dev *dev)
 }
 
 /* Determine if we're in the Manufactured Inactive or Active state */
-static int get_lsp_lifecycle(struct opal_dev *dev)
+static int get_lsp_lifecycle(struct opal_dev *dev, void *data)
 {
         int err = 0;
 
@@ -1915,14 +1903,13 @@ static int get_msid_cpin_pin_cont(struct opal_dev *dev)
         return 0;
 }
 
-static int get_msid_cpin_pin(struct opal_dev *dev)
+static int get_msid_cpin_pin(struct opal_dev *dev, void *data)
 {
         int err = 0;
 
         clear_opal_cmd(dev);
         set_comid(dev, dev->comid);
 
-
         add_token_u8(&err, dev, OPAL_CALL);
         add_token_bytestring(&err, dev, opaluid[OPAL_C_PIN_MSID],
                              OPAL_UID_LENGTH);
@@ -1952,58 +1939,48 @@ static int get_msid_cpin_pin(struct opal_dev *dev)
         return finalize_and_send(dev, get_msid_cpin_pin_cont);
 }
 
-static int build_end_opal_session(struct opal_dev *dev)
+static int end_opal_session(struct opal_dev *dev, void *data)
 {
         int err = 0;
 
         clear_opal_cmd(dev);
-
         set_comid(dev, dev->comid);
         add_token_u8(&err, dev, OPAL_ENDOFSESSION);
-        return err;
-}
-
-static int end_opal_session(struct opal_dev *dev)
-{
-        int ret = build_end_opal_session(dev);
 
-        if (ret < 0)
-                return ret;
+        if (err < 0)
+                return err;
         return finalize_and_send(dev, end_session_cont);
 }
 
 static int end_opal_session_error(struct opal_dev *dev)
 {
-        const opal_step error_end_session[] = {
-                end_opal_session,
-                NULL,
+        const struct opal_step error_end_session[] = {
+                { end_opal_session, },
+                { NULL, }
         };
-        dev->funcs = error_end_session;
-        dev->state = 0;
+        dev->steps = error_end_session;
         return next(dev);
 }
 
 static inline void setup_opal_dev(struct opal_dev *dev,
-                                  const opal_step *funcs)
+                                  const struct opal_step *steps)
 {
-        dev->state = 0;
-        dev->funcs = funcs;
+        dev->steps = steps;
         dev->tsn = 0;
         dev->hsn = 0;
-        dev->func_data = NULL;
         dev->prev_data = NULL;
 }
 
 static int check_opal_support(struct opal_dev *dev)
 {
-        static const opal_step funcs[] = {
-                opal_discovery0,
-                NULL
+        const struct opal_step steps[] = {
+                { opal_discovery0, },
+                { NULL, }
         };
         int ret;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, funcs);
+        setup_opal_dev(dev, steps);
         ret = next(dev);
         dev->supported = !ret;
         mutex_unlock(&dev->dev_lock);
@@ -2034,24 +2011,18 @@ EXPORT_SYMBOL(init_opal_dev);
 static int opal_secure_erase_locking_range(struct opal_dev *dev,
                                            struct opal_session_info *opal_session)
 {
-        void *data[3] = { NULL };
-        static const opal_step erase_funcs[] = {
-                opal_discovery0,
-                start_auth_opal_session,
-                get_active_key,
-                gen_key,
-                end_opal_session,
-                NULL,
+        const struct opal_step erase_steps[] = {
+                { opal_discovery0, },
+                { start_auth_opal_session, opal_session },
+                { get_active_key, &opal_session->opal_key.lr },
+                { gen_key, },
+                { end_opal_session, },
+                { NULL, }
         };
         int ret;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, erase_funcs);
-
-        dev->func_data = data;
-        dev->func_data[1] = opal_session;
-        dev->func_data[2] = &opal_session->opal_key.lr;
-
+        setup_opal_dev(dev, erase_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2060,23 +2031,17 @@ static int opal_secure_erase_locking_range(struct opal_dev *dev,
 static int opal_erase_locking_range(struct opal_dev *dev,
                                     struct opal_session_info *opal_session)
 {
-        void *data[3] = { NULL };
-        static const opal_step erase_funcs[] = {
-                opal_discovery0,
-                start_auth_opal_session,
-                erase_locking_range,
-                end_opal_session,
-                NULL,
+        const struct opal_step erase_steps[] = {
+                { opal_discovery0, },
+                { start_auth_opal_session, opal_session },
+                { erase_locking_range, opal_session },
+                { end_opal_session, },
+                { NULL, }
         };
         int ret;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, erase_funcs);
-
-        dev->func_data = data;
-        dev->func_data[1] = opal_session;
-        dev->func_data[2] = opal_session;
-
+        setup_opal_dev(dev, erase_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2085,16 +2050,15 @@ static int opal_erase_locking_range(struct opal_dev *dev,
 static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,
                                           struct opal_mbr_data *opal_mbr)
 {
-        void *func_data[6] = { NULL };
-        static const opal_step mbr_funcs[] = {
-                opal_discovery0,
-                start_admin1LSP_opal_session,
-                set_mbr_done,
-                end_opal_session,
-                start_admin1LSP_opal_session,
-                set_mbr_enable_disable,
-                end_opal_session,
-                NULL,
+        const struct opal_step mbr_steps[] = {
+                { opal_discovery0, },
+                { start_admin1LSP_opal_session, &opal_mbr->key },
+                { set_mbr_done, &opal_mbr->enable_disable },
+                { end_opal_session, },
+                { start_admin1LSP_opal_session, &opal_mbr->key },
+                { set_mbr_enable_disable, &opal_mbr->enable_disable },
+                { end_opal_session, },
+                { NULL, }
         };
         int ret;
 
@@ -2103,12 +2067,7 @@ static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,
                 return -EINVAL;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, mbr_funcs);
-        dev->func_data = func_data;
-        dev->func_data[1] = &opal_mbr->key;
-        dev->func_data[2] = &opal_mbr->enable_disable;
-        dev->func_data[4] = &opal_mbr->key;
-        dev->func_data[5] = &opal_mbr->enable_disable;
+        setup_opal_dev(dev, mbr_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2135,13 +2094,12 @@ static int opal_save(struct opal_dev *dev, struct opal_lock_unlock *lk_unlk)
 static int opal_add_user_to_lr(struct opal_dev *dev,
                                struct opal_lock_unlock *lk_unlk)
 {
-        void *func_data[3] = { NULL };
-        static const opal_step funcs[] = {
-                opal_discovery0,
-                start_admin1LSP_opal_session,
-                add_user_to_lr,
-                end_opal_session,
-                NULL
+        const struct opal_step steps[] = {
+                { opal_discovery0, },
+                { start_admin1LSP_opal_session, &lk_unlk->session.opal_key },
+                { add_user_to_lr, lk_unlk },
+                { end_opal_session, },
+                { NULL, }
         };
         int ret;
 
@@ -2163,10 +2121,7 @@ static int opal_add_user_to_lr(struct opal_dev *dev,
         }
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, funcs);
-        dev->func_data = func_data;
-        dev->func_data[1] = &lk_unlk->session.opal_key;
-        dev->func_data[2] = lk_unlk;
+        setup_opal_dev(dev, steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2174,55 +2129,46 @@ static int opal_add_user_to_lr(struct opal_dev *dev,
 
 static int opal_reverttper(struct opal_dev *dev, struct opal_key *opal)
 {
-        void *data[2] = { NULL };
-        static const opal_step revert_funcs[] = {
-                opal_discovery0,
-                start_SIDASP_opal_session,
-                revert_tper, /* controller will terminate session */
-                NULL,
+        const struct opal_step revert_steps[] = {
+                { opal_discovery0, },
+                { start_SIDASP_opal_session, opal },
+                { revert_tper, }, /* controller will terminate session */
+                { NULL, }
         };
         int ret;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, revert_funcs);
-        dev->func_data = data;
-        dev->func_data[1] = opal;
+        setup_opal_dev(dev, revert_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
 }
 
-static int __opal_lock_unlock_sum(struct opal_dev *dev)
+static int __opal_lock_unlock(struct opal_dev *dev,
+                              struct opal_lock_unlock *lk_unlk)
 {
-        static const opal_step ulk_funcs_sum[] = {
-                opal_discovery0,
-                start_auth_opal_session,
-                lock_unlock_locking_range_sum,
-                end_opal_session,
-                NULL
+        const struct opal_step unlock_steps[] = {
+                { opal_discovery0, },
+                { start_auth_opal_session, &lk_unlk->session },
+                { lock_unlock_locking_range, lk_unlk },
+                { end_opal_session, },
+                { NULL, }
         };
-
-        dev->funcs = ulk_funcs_sum;
-        return next(dev);
-}
-
-static int __opal_lock_unlock(struct opal_dev *dev)
-{
-        static const opal_step _unlock_funcs[] = {
-                opal_discovery0,
-                start_auth_opal_session,
-                lock_unlock_locking_range,
-                end_opal_session,
-                NULL
+        const struct opal_step unlock_sum_steps[] = {
+                { opal_discovery0, },
+                { start_auth_opal_session, &lk_unlk->session },
+                { lock_unlock_locking_range_sum, lk_unlk },
+                { end_opal_session, },
+                { NULL, }
         };
 
-        dev->funcs = _unlock_funcs;
+        dev->steps = lk_unlk->session.sum ? unlock_sum_steps : unlock_steps;
         return next(dev);
 }
 
-static int opal_lock_unlock(struct opal_dev *dev, struct opal_lock_unlock *lk_unlk)
+static int opal_lock_unlock(struct opal_dev *dev,
+                            struct opal_lock_unlock *lk_unlk)
 {
-        void *func_data[3] = { NULL };
         int ret;
 
         if (lk_unlk->session.who < OPAL_ADMIN1 ||
@@ -2230,43 +2176,30 @@ static int opal_lock_unlock(struct opal_dev *dev, struct opal_lock_unlock *lk_un
                 return -EINVAL;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, NULL);
-        dev->func_data = func_data;
-        dev->func_data[1] = &lk_unlk->session;
-        dev->func_data[2] = lk_unlk;
-
-        if (lk_unlk->session.sum)
-                ret = __opal_lock_unlock_sum(dev);
-        else
-                ret = __opal_lock_unlock(dev);
-
+        ret = __opal_lock_unlock(dev, lk_unlk);
         mutex_unlock(&dev->dev_lock);
         return ret;
 }
 
 static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal)
 {
-        static const opal_step owner_funcs[] = {
-                opal_discovery0,
-                start_anybodyASP_opal_session,
-                get_msid_cpin_pin,
-                end_opal_session,
-                start_SIDASP_opal_session,
-                set_sid_cpin_pin,
-                end_opal_session,
-                NULL
+        const struct opal_step owner_steps[] = {
+                { opal_discovery0, },
+                { start_anybodyASP_opal_session, },
+                { get_msid_cpin_pin, },
+                { end_opal_session, },
+                { start_SIDASP_opal_session, opal },
+                { set_sid_cpin_pin, opal },
+                { end_opal_session, },
+                { NULL, }
         };
-        void *data[6] = { NULL };
         int ret;
 
         if (!dev)
                 return -ENODEV;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, owner_funcs);
-        dev->func_data = data;
-        dev->func_data[4] = opal;
-        dev->func_data[5] = opal;
+        setup_opal_dev(dev, owner_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2274,14 +2207,13 @@ static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal)
 
 static int opal_activate_lsp(struct opal_dev *dev, struct opal_lr_act *opal_lr_act)
 {
-        void *data[4] = { NULL };
-        static const opal_step active_funcs[] = {
-                opal_discovery0,
-                start_SIDASP_opal_session, /* Open session as SID auth */
-                get_lsp_lifecycle,
-                activate_lsp,
-                end_opal_session,
-                NULL
+        const struct opal_step active_steps[] = {
+                { opal_discovery0, },
+                { start_SIDASP_opal_session, &opal_lr_act->key },
+                { get_lsp_lifecycle, },
+                { activate_lsp, opal_lr_act },
+                { end_opal_session, },
+                { NULL, }
         };
         int ret;
 
@@ -2289,10 +2221,7 @@ static int opal_activate_lsp(struct opal_dev *dev, struct opal_lr_act *opal_lr_a
                 return -EINVAL;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, active_funcs);
-        dev->func_data = data;
-        dev->func_data[1] = &opal_lr_act->key;
-        dev->func_data[3] = opal_lr_act;
+        setup_opal_dev(dev, active_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2301,21 +2230,17 @@ static int opal_activate_lsp(struct opal_dev *dev, struct opal_lr_act *opal_lr_a
 static int opal_setup_locking_range(struct opal_dev *dev,
                                     struct opal_user_lr_setup *opal_lrs)
 {
-        void *data[3] = { NULL };
-        static const opal_step lr_funcs[] = {
-                opal_discovery0,
-                start_auth_opal_session,
-                setup_locking_range,
-                end_opal_session,
-                NULL,
+        const struct opal_step lr_steps[] = {
+                { opal_discovery0, },
+                { start_auth_opal_session, &opal_lrs->session },
+                { setup_locking_range, opal_lrs },
+                { end_opal_session, },
+                { NULL, }
         };
         int ret;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, lr_funcs);
-        dev->func_data = data;
-        dev->func_data[1] = &opal_lrs->session;
-        dev->func_data[2] = opal_lrs;
+        setup_opal_dev(dev, lr_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2323,14 +2248,13 @@ static int opal_setup_locking_range(struct opal_dev *dev,
 
 static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw)
 {
-        static const opal_step pw_funcs[] = {
-                opal_discovery0,
-                start_auth_opal_session,
-                set_new_pw,
-                end_opal_session,
-                NULL
+        const struct opal_step pw_steps[] = {
+                { opal_discovery0, },
+                { start_auth_opal_session, &opal_pw->session },
+                { set_new_pw, &opal_pw->new_user_pw },
+                { end_opal_session, },
+                { NULL }
         };
-        void *data[3] = { NULL };
         int ret;
 
         if (opal_pw->session.who < OPAL_ADMIN1 ||
@@ -2340,11 +2264,7 @@ static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw)
                 return -EINVAL;
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, pw_funcs);
-        dev->func_data = data;
-        dev->func_data[1] = (void *) &opal_pw->session;
-        dev->func_data[2] = (void *) &opal_pw->new_user_pw;
-
+        setup_opal_dev(dev, pw_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2353,14 +2273,13 @@ static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw)
 static int opal_activate_user(struct opal_dev *dev,
                               struct opal_session_info *opal_session)
 {
-        static const opal_step act_funcs[] = {
-                opal_discovery0,
-                start_admin1LSP_opal_session,
-                internal_activate_user,
-                end_opal_session,
-                NULL
+        const struct opal_step act_steps[] = {
+                { opal_discovery0, },
+                { start_admin1LSP_opal_session, &opal_session->opal_key },
+                { internal_activate_user, opal_session },
+                { end_opal_session, },
+                { NULL, }
         };
-        void *data[3] = { NULL };
         int ret;
 
         /* We can't activate Admin1 it's active as manufactured */
@@ -2371,10 +2290,7 @@ static int opal_activate_user(struct opal_dev *dev,
         }
 
         mutex_lock(&dev->dev_lock);
-        setup_opal_dev(dev, act_funcs);
-        dev->func_data = data;
-        dev->func_data[1] = &opal_session->opal_key;
-        dev->func_data[2] = opal_session;
+        setup_opal_dev(dev, act_steps);
         ret = next(dev);
         mutex_unlock(&dev->dev_lock);
         return ret;
@@ -2383,7 +2299,6 @@ static int opal_activate_user(struct opal_dev *dev,
 bool opal_unlock_from_suspend(struct opal_dev *dev)
 {
         struct opal_suspend_data *suspend;
-        void *func_data[3] = { NULL };
         bool was_failure = false;
         int ret = 0;
 
@@ -2394,19 +2309,12 @@ bool opal_unlock_from_suspend(struct opal_dev *dev)
 
         mutex_lock(&dev->dev_lock);
         setup_opal_dev(dev, NULL);
-        dev->func_data = func_data;
 
         list_for_each_entry(suspend, &dev->unlk_lst, node) {
-                dev->state = 0;
-                dev->func_data[1] = &suspend->unlk.session;
-                dev->func_data[2] = &suspend->unlk;
                 dev->tsn = 0;
                 dev->hsn = 0;
 
-                if (suspend->unlk.session.sum)
-                        ret = __opal_lock_unlock_sum(dev);
-                else
-                        ret = __opal_lock_unlock(dev);
+                ret = __opal_lock_unlock(dev, &suspend->unlk);
                 if (ret) {
                         pr_warn("Failed to unlock LR %hhu with sum %d\n",
                                 suspend->unlk.session.opal_key.lr,
@@ -2433,7 +2341,7 @@ int sed_ioctl(struct opal_dev *dev, unsigned int cmd, void __user *arg)
                 return -ENOTSUPP;
         }
 
-        p = memdup_user(arg,  _IOC_SIZE(cmd));
+        p = memdup_user(arg, _IOC_SIZE(cmd));
         if (IS_ERR(p))
                 return PTR_ERR(p);