Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 576e661c authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: factor out cciss_getintinfo 



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 0a25a5ae

drivers/block/cciss.c

+15 −13
Original line number Diff line number Diff line
@@ -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;