diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-08-26 14:56:15 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 06:12:35 -0400 |
commit | c525919ddf0b10ff0e1f528dd50d90edfdee4797 (patch) | |
tree | 2c39db5a4e1e648bc5d15c7017663c2139a66aa3 /drivers/block/cciss.c | |
parent | 8a4f7fbfdd76a304c8f04dde6b8fd0e5c50bbe76 (diff) |
cciss: factor out cciss_getdrivver
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 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index c47e601f601c..71018b988595 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -1371,8 +1371,19 @@ static int cciss_getfirmver(ctlr_info_t *h, void __user *argp) | |||
1371 | return 0; | 1371 | return 0; |
1372 | } | 1372 | } |
1373 | 1373 | ||
1374 | static int cciss_getdrivver(ctlr_info_t *h, void __user *argp) | ||
1375 | { | ||
1376 | DriverVer_type DriverVer = DRIVER_VERSION; | ||
1377 | |||
1378 | if (!argp) | ||
1379 | return -EINVAL; | ||
1380 | if (copy_to_user(argp, &DriverVer, sizeof(DriverVer_type))) | ||
1381 | return -EFAULT; | ||
1382 | return 0; | ||
1383 | } | ||
1384 | |||
1374 | static int cciss_ioctl(struct block_device *bdev, fmode_t mode, | 1385 | static int cciss_ioctl(struct block_device *bdev, fmode_t mode, |
1375 | unsigned int cmd, unsigned long arg) | 1386 | unsigned int cmd, unsigned long arg) |
1376 | { | 1387 | { |
1377 | struct gendisk *disk = bdev->bd_disk; | 1388 | struct gendisk *disk = bdev->bd_disk; |
1378 | ctlr_info_t *h = get_host(disk); | 1389 | ctlr_info_t *h = get_host(disk); |
@@ -1399,18 +1410,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, | |||
1399 | case CCISS_GETFIRMVER: | 1410 | case CCISS_GETFIRMVER: |
1400 | return cciss_getfirmver(h, argp); | 1411 | return cciss_getfirmver(h, argp); |
1401 | case CCISS_GETDRIVVER: | 1412 | case CCISS_GETDRIVVER: |
1402 | { | 1413 | return cciss_getdrivver(h, argp); |
1403 | DriverVer_type DriverVer = DRIVER_VERSION; | ||
1404 | |||
1405 | if (!arg) | ||
1406 | return -EINVAL; | ||
1407 | |||
1408 | if (copy_to_user | ||
1409 | (argp, &DriverVer, sizeof(DriverVer_type))) | ||
1410 | return -EFAULT; | ||
1411 | return 0; | ||
1412 | } | ||
1413 | |||
1414 | case CCISS_DEREGDISK: | 1414 | case CCISS_DEREGDISK: |
1415 | case CCISS_REGNEWD: | 1415 | case CCISS_REGNEWD: |
1416 | case CCISS_REVALIDVOLS: | 1416 | case CCISS_REVALIDVOLS: |