diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-08-26 13:55:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 12:12:29 +0200 |
| commit | 576e661c658ab7d2a15cc12d5b8a1600db81ec0a (patch) | |
| tree | 1396cc0c1192b154f1f9e3cad80218e65e263283 /drivers/block | |
| parent | 0a25a5aee727c4a56c7d39e0e595947b02ee2696 (diff) | |
| download | op-kernel-dev-576e661c658ab7d2a15cc12d5b8a1600db81ec0a.zip op-kernel-dev-576e661c658ab7d2a15cc12d5b8a1600db81ec0a.tar.gz | |
cciss: factor out cciss_getintinfo
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 4fe5e42..fc76140 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1246,6 +1246,20 @@ static int cciss_getpciinfo(ctlr_info_t *h, void __user *argp) return 0; } +static int cciss_getintinfo(ctlr_info_t *h, void __user *argp) +{ + cciss_coalint_struct intinfo; + + if (!argp) + return -EINVAL; + intinfo.delay = readl(&h->cfgtable->HostWrite.CoalIntDelay); + intinfo.count = readl(&h->cfgtable->HostWrite.CoalIntCount); + if (copy_to_user + (argp, &intinfo, sizeof(cciss_coalint_struct))) + return -EFAULT; + return 0; +} + static int cciss_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { @@ -1260,19 +1274,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, case CCISS_GETPCIINFO: return cciss_getpciinfo(h, argp); case CCISS_GETINTINFO: - { - cciss_coalint_struct intinfo; - if (!arg) - return -EINVAL; - intinfo.delay = - readl(&h->cfgtable->HostWrite.CoalIntDelay); - intinfo.count = - readl(&h->cfgtable->HostWrite.CoalIntCount); - if (copy_to_user - (argp, &intinfo, sizeof(cciss_coalint_struct))) - return -EFAULT; - return 0; - } + return cciss_getintinfo(h, argp); case CCISS_SETINTINFO: { cciss_coalint_struct intinfo; |
