From fe9d2b7b6986a256d1119b2e1941c3106578d1af Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Thu, 4 Feb 2010 08:43:46 -0600 Subject: [PATCH] --- yaml --- r: 181342 b: refs/heads/master c: e39eeaed1f75fcd46783aad34cb9ab8a6046bb01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index a72af6011f2f..f5878a9f7d19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a8ccf3187aff6defed72f7d8fa562ff2f69ef2a +refs/heads/master: e39eeaed1f75fcd46783aad34cb9ab8a6046bb01 diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 6b40221a7220..225a787dedf3 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -2287,16 +2287,6 @@ static void cmd_special_free(struct ctlr_info *h, struct CommandList *c) #ifdef CONFIG_COMPAT -static int do_ioctl(struct scsi_device *dev, int cmd, void *arg) -{ - int ret; - - lock_kernel(); - ret = hpsa_ioctl(dev, cmd, arg); - unlock_kernel(); - return ret; -} - static int hpsa_ioctl32_passthru(struct scsi_device *dev, int cmd, void *arg); static int hpsa_ioctl32_big_passthru(struct scsi_device *dev, int cmd, void *arg); @@ -2319,7 +2309,7 @@ static int hpsa_compat_ioctl(struct scsi_device *dev, int cmd, void *arg) case CCISS_REGNEWD: case CCISS_RESCANDISK: case CCISS_GETLUNINFO: - return do_ioctl(dev, cmd, arg); + return hpsa_ioctl(dev, cmd, arg); case CCISS_PASSTHRU32: return hpsa_ioctl32_passthru(dev, cmd, arg); @@ -2355,7 +2345,7 @@ static int hpsa_ioctl32_passthru(struct scsi_device *dev, int cmd, void *arg) if (err) return -EFAULT; - err = do_ioctl(dev, CCISS_PASSTHRU, (void *)p); + err = hpsa_ioctl(dev, CCISS_PASSTHRU, (void *)p); if (err) return err; err |= copy_in_user(&arg32->error_info, &p->error_info, @@ -2392,7 +2382,7 @@ static int hpsa_ioctl32_big_passthru(struct scsi_device *dev, if (err) return -EFAULT; - err = do_ioctl(dev, CCISS_BIG_PASSTHRU, (void *)p); + err = hpsa_ioctl(dev, CCISS_BIG_PASSTHRU, (void *)p); if (err) return err; err |= copy_in_user(&arg32->error_info, &p->error_info,