block: sed-opal: fix typos and formatting

This should make no change in functionality.
The formatting changes were triggered by checkpatch.pl.

Reviewed-by: Scott Bauer <sbauer@plzdonthack.me>
Reviewed-by: Jon Derrick <jonathan.derrick@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David Kozub <zub@linux.fjfi.cvut.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 1196408972937cf306139faa2ed188fb187e777d..d12a910e06cbf2f6af4a0a2c3e07d237680ac0ff 100644 (file)
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -157,7 +157,7 @@ static const u8 opaluid[][OPAL_UID_LENGTH] = {
 
        /* C_PIN_TABLE object ID's */
 
-        [OPAL_C_PIN_MSID] =
+       [OPAL_C_PIN_MSID] =
                { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x84, 0x02},
        [OPAL_C_PIN_SID] =
                { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01},
@@ -551,7 +551,6 @@ static void add_medium_atom_header(struct opal_dev *cmd, bool bytestring,
 
 static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)
 {
-
        size_t len;
        int msb;
 
@@ -623,7 +622,7 @@ static int build_locking_range(u8 *buffer, size_t length, u8 lr)
 static int build_locking_user(u8 *buffer, size_t length, u8 lr)
 {
        if (length > OPAL_UID_LENGTH) {
-               pr_debug("Can't build locking range user, Length OOB\n");
+               pr_debug("Can't build locking range user. Length OOB\n");
                return -ERANGE;
        }
 
@@ -1324,6 +1323,7 @@ static int start_SIDASP_opal_session(struct opal_dev *dev, void *data)
 
        if (!key) {
                const struct opal_key *okey = data;
+
                ret = start_generic_opal_session(dev, OPAL_SID_UID,
                                                 OPAL_ADMINSP_UID,
                                                 okey->key,
@@ -1341,6 +1341,7 @@ static int start_SIDASP_opal_session(struct opal_dev *dev, void *data)
 static int start_admin1LSP_opal_session(struct opal_dev *dev, void *data)
 {
        struct opal_key *key = data;
+
        return start_generic_opal_session(dev, OPAL_ADMIN1_UID,
                                          OPAL_LOCKINGSP_UID,
                                          key->key, key->key_len);
@@ -1714,7 +1715,7 @@ static int lock_unlock_locking_range(struct opal_dev *dev, void *data)
                write_locked = 0;
                break;
        case OPAL_LK:
-               /* vars are initalized to locked */
+               /* vars are initialized to locked */
                break;
        default:
                pr_debug("Tried to set an invalid locking state... returning to uland\n");
@@ -1775,7 +1776,7 @@ static int lock_unlock_locking_range_sum(struct opal_dev *dev, void *data)
                write_locked = 0;
                break;
        case OPAL_LK:
-               /* vars are initalized to locked */
+               /* vars are initialized to locked */
                break;
        default:
                pr_debug("Tried to set an invalid locking state.\n");
@@ -1854,7 +1855,7 @@ static int get_lsp_lifecycle_cont(struct opal_dev *dev)
                return error;
 
        lc_status = response_get_u64(&dev->parsed, 4);
-       /* 0x08 is Manufacured Inactive */
+       /* 0x08 is Manufactured Inactive */
        /* 0x09 is Manufactured */
        if (lc_status != OPAL_MANUFACTURED_INACTIVE) {
                pr_debug("Couldn't determine the status of the Lifecycle state\n");
@@ -2225,7 +2226,7 @@ static int __opal_lock_unlock(struct opal_dev *dev,
 static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)
 {
        u8 mbr_done_tf = OPAL_TRUE;
-       const struct opal_step mbrdone_step [] = {
+       const struct opal_step mbrdone_step[] = {
                { opal_discovery0, },
                { start_admin1LSP_opal_session, key },
                { set_mbr_done, &mbr_done_tf },
@@ -2276,7 +2277,8 @@ static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal)
        return ret;
 }
 
-static int opal_activate_lsp(struct opal_dev *dev, struct opal_lr_act *opal_lr_act)
+static int opal_activate_lsp(struct opal_dev *dev,
+                            struct opal_lr_act *opal_lr_act)
 {
        const struct opal_step active_steps[] = {
                { opal_discovery0, },

diff --git a/include/uapi/linux/sed-opal.h b/include/uapi/linux/sed-opal.h
index 627624d35030a163bd8e443f01325c8ee3ece76a..e092e124dd167e2cc3b728d4a731570a71f342a1 100644 (file)
--- a/include/uapi/linux/sed-opal.h
+++ b/include/uapi/linux/sed-opal.h
@@ -58,7 +58,7 @@ struct opal_key {
 struct opal_lr_act {
        struct opal_key key;
        __u32 sum;
-       __u8    num_lrs;
+       __u8 num_lrs;
        __u8 lr[OPAL_MAX_LRS];
        __u8 align[2]; /* Align to 8 byte boundary */
 };