diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-08-26 13:56:10 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 12:12:34 +0200 |
| commit | 8a4f7fbfdd76a304c8f04dde6b8fd0e5c50bbe76 (patch) | |
| tree | becfda4a679543971f2cdbc948d47cb960bf80c0 /drivers/block/cciss.c | |
| parent | d18dfad4e2bf6c2d2c5c104d882b14b9fee71b14 (diff) | |
| download | linux-8a4f7fbfdd76a304c8f04dde6b8fd0e5c50bbe76.tar.bz2 | |
cciss: factor out cciss_getfirmver
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index e7b650b7f548..c47e601f601c 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1357,6 +1357,20 @@ static int cciss_getbustypes(ctlr_info_t *h, void __user *argp) return 0; } +static int cciss_getfirmver(ctlr_info_t *h, void __user *argp) +{ + FirmwareVer_type firmware; + + if (!argp) + return -EINVAL; + memcpy(firmware, h->firm_ver, 4); + + if (copy_to_user + (argp, firmware, sizeof(FirmwareVer_type))) + return -EFAULT; + return 0; +} + static int cciss_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { @@ -1383,18 +1397,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, case CCISS_GETBUSTYPES: return cciss_getbustypes(h, argp); case CCISS_GETFIRMVER: - { - FirmwareVer_type firmware; - - if (!arg) - return -EINVAL; - memcpy(firmware, h->firm_ver, 4); - - if (copy_to_user - (argp, firmware, sizeof(FirmwareVer_type))) - return -EFAULT; - return 0; - } + return cciss_getfirmver(h, argp); case CCISS_GETDRIVVER: { DriverVer_type DriverVer = DRIVER_VERSION; |