summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2020-05-30 01:40:28 +0200
committerMartin K. Petersen <martin.petersen@oracle.com>2020-06-04 16:15:32 +0200
commit06b43f968db58fd582b09b745338eae5af9f9f5e (patch)
tree10590df388f8ee53749098c0ae2385a2c5b8f23a /drivers
parentscsi: hpsa: Get rid of compat_alloc_user_space() (diff)
downloadlinux-06b43f968db58fd582b09b745338eae5af9f9f5e.tar.xz
linux-06b43f968db58fd582b09b745338eae5af9f9f5e.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/hpsa.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index c7fbe56891ef..81d0414e2117 100644
--- 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: