diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-08-26 20:56:05 +0200 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 12:12:33 +0200 |
commit | d18dfad4e2bf6c2d2c5c104d882b14b9fee71b14 (patch) | |
tree | a7ccc43dbe19dba9b5d14ac08871813c62470c59 | |
parent | cciss: factor out cciss_getheartbeat (diff) | |
download | linux-d18dfad4e2bf6c2d2c5c104d882b14b9fee71b14.tar.xz linux-d18dfad4e2bf6c2d2c5c104d882b14b9fee71b14.zip |
cciss: factor out cciss_getbustypes
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r-- | drivers/block/cciss.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index e716fc9e4b3e..e7b650b7f548 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1345,6 +1345,18 @@ static int cciss_getheartbeat(ctlr_info_t *h, void __user *argp) return 0; } +static int cciss_getbustypes(ctlr_info_t *h, void __user *argp) +{ + BusTypes_type BusTypes; + + if (!argp) + return -EINVAL; + BusTypes = readl(&h->cfgtable->BusTypes); + if (copy_to_user(argp, &BusTypes, sizeof(BusTypes_type))) + return -EFAULT; + return 0; +} + static int cciss_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { @@ -1369,17 +1381,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, case CCISS_GETHEARTBEAT: return cciss_getheartbeat(h, argp); case CCISS_GETBUSTYPES: - { - BusTypes_type BusTypes; - - if (!arg) - return -EINVAL; - BusTypes = readl(&h->cfgtable->BusTypes); - if (copy_to_user - (argp, &BusTypes, sizeof(BusTypes_type))) - return -EFAULT; - return 0; - } + return cciss_getbustypes(h, argp); case CCISS_GETFIRMVER: { FirmwareVer_type firmware; |