scsi: hpsa: hpsa_ioctl(): Tidy up a bit

Link: https://lore.kernel.org/r/20200529234028.46373-4-viro@ZenIV.linux.org.uk
Acked-by: Don Brace <don.brace@microsemi.com>
Tested-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index c7fbe56891ef03ed49ac0acad92c547761257be7..81d0414e21175bb88a969eaa514ea373512f9017 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6577,14 +6577,11 @@ static void check_ioctl_unit_attention(struct ctlr_info *h,
  * ioctl
  */
 static int hpsa_ioctl(struct scsi_device *dev, unsigned int cmd,
-                     void __user *arg)
+                     void __user *argp)
 {
-       struct ctlr_info *h;
-       void __user *argp = (void __user *)arg;
+       struct ctlr_info *h = sdev_to_hba(dev);
        int rc;
 
-       h = sdev_to_hba(dev);
-
        switch (cmd) {
        case CCISS_DEREGDISK:
        case CCISS_REGNEWDISK: