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

Commit 8a4f7fbf authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: factor out cciss_getfirmver 



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

drivers/block/cciss.c

+15 −12
Original line number Diff line number Diff line
@@ -1357,6 +1357,20 @@ static int cciss_getbustypes(ctlr_info_t *h, void __user *argp) 
	return 0;

}



static int cciss_getfirmver(ctlr_info_t *h, void __user *argp)

{

	FirmwareVer_type firmware;



	if (!argp)

		return -EINVAL;

	memcpy(firmware, h->firm_ver, 4);



	if (copy_to_user

	    (argp, firmware, sizeof(FirmwareVer_type)))

		return -EFAULT;

	return 0;

}



static int cciss_ioctl(struct block_device *bdev, fmode_t mode,

		       unsigned int cmd, unsigned long arg)

{
@@ -1383,18 +1397,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, 
	case CCISS_GETBUSTYPES:

		return cciss_getbustypes(h, argp);

	case CCISS_GETFIRMVER:

		{

			FirmwareVer_type firmware;



			if (!arg)

				return -EINVAL;

			memcpy(firmware, h->firm_ver, 4);



			if (copy_to_user

			    (argp, firmware, sizeof(FirmwareVer_type)))

				return -EFAULT;

			return 0;

		}

		return cciss_getfirmver(h, argp);

	case CCISS_GETDRIVVER:

		{

			DriverVer_type DriverVer = DRIVER_VERSION;