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

Commit 0a25a5ae authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: factor out cciss_getpciinfo 



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

drivers/block/cciss.c

+17 −17
Original line number Diff line number Diff line
@@ -1230,35 +1230,35 @@ static void check_ioctl_unit_attention(ctlr_info_t *h, CommandList_struct *c) 
			c->err_info->ScsiStatus != SAM_STAT_CHECK_CONDITION)

		(void)check_for_unit_attention(h, c);

}

/*

 * ioctl

 */

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

		       unsigned int cmd, unsigned long arg)

{

	struct gendisk *disk = bdev->bd_disk;

	ctlr_info_t *h = get_host(disk);

	drive_info_struct *drv = get_drv(disk);

	void __user *argp = (void __user *)arg;



	dev_dbg(&h->pdev->dev, "cciss_ioctl: Called with cmd=%x %lx\n",

		cmd, arg);

	switch (cmd) {

	case CCISS_GETPCIINFO:

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

{

	cciss_pci_info_struct pciinfo;



			if (!arg)

	if (!argp)

		return -EINVAL;

	pciinfo.domain = pci_domain_nr(h->pdev->bus);

	pciinfo.bus = h->pdev->bus->number;

	pciinfo.dev_fn = h->pdev->devfn;

	pciinfo.board_id = h->board_id;

			if (copy_to_user

			    (argp, &pciinfo, sizeof(cciss_pci_info_struct)))

	if (copy_to_user(argp, &pciinfo, sizeof(cciss_pci_info_struct)))

		return -EFAULT;

	return 0;

}



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

		       unsigned int cmd, unsigned long arg)

{

	struct gendisk *disk = bdev->bd_disk;

	ctlr_info_t *h = get_host(disk);

	drive_info_struct *drv = get_drv(disk);

	void __user *argp = (void __user *)arg;



	dev_dbg(&h->pdev->dev, "cciss_ioctl: Called with cmd=%x %lx\n",

		cmd, arg);

	switch (cmd) {

	case CCISS_GETPCIINFO:

		return cciss_getpciinfo(h, argp);

	case CCISS_GETINTINFO:

		{

			cciss_coalint_struct intinfo;