diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-08-26 20:55:59 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 12:12:32 +0200 |
| commit | 93c74931131d3a7af3a6aa18aab0d39978b5d3b5 (patch) | |
| tree | 81f9811e6cc2f8d3072f4fbe90a242f0e4d7d5ed | |
| parent | cciss: factor out cciss_setnodename (diff) | |
| download | linux-93c74931131d3a7af3a6aa18aab0d39978b5d3b5.tar.xz linux-93c74931131d3a7af3a6aa18aab0d39978b5d3b5.zip | |
cciss: factor out cciss_getheartbeat
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 8bbb1c81bf86..e716fc9e4b3e 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1333,6 +1333,18 @@ static int cciss_setnodename(ctlr_info_t *h, void __user *argp) return 0; } +static int cciss_getheartbeat(ctlr_info_t *h, void __user *argp) +{ + Heartbeat_type heartbeat; + + if (!argp) + return -EINVAL; + heartbeat = readl(&h->cfgtable->HeartBeat); + if (copy_to_user(argp, &heartbeat, sizeof(Heartbeat_type))) + return -EFAULT; + return 0; +} + static int cciss_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { @@ -1355,17 +1367,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, case CCISS_SETNODENAME: return cciss_setnodename(h, argp); case CCISS_GETHEARTBEAT: - { - Heartbeat_type heartbeat; - - if (!arg) - return -EINVAL; - heartbeat = readl(&h->cfgtable->HeartBeat); - if (copy_to_user - (argp, &heartbeat, sizeof(Heartbeat_type))) - return -EFAULT; - return 0; - } + return cciss_getheartbeat(h, argp); case CCISS_GETBUSTYPES: { BusTypes_type BusTypes; |