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

Commit 4c800eed authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: factor out cciss_setintinfo 



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

drivers/block/cciss.c

+32 −34
Original line number Diff line number Diff line
@@ -1260,56 +1260,54 @@ static int cciss_getintinfo(ctlr_info_t *h, void __user *argp) 
	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:

		return cciss_getintinfo(h, argp);

	case CCISS_SETINTINFO:

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

{

	cciss_coalint_struct intinfo;

	unsigned long flags;

	int i;



			if (!arg)

	if (!argp)

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

			if (copy_from_user

			    (&intinfo, argp, sizeof(cciss_coalint_struct)))

	if (copy_from_user(&intinfo, argp, sizeof(intinfo)))

		return -EFAULT;

	if ((intinfo.delay == 0) && (intinfo.count == 0))

		return -EINVAL;

	spin_lock_irqsave(&h->lock, flags);

	/* Update the field, and then ring the doorbell */

			writel(intinfo.delay,

			       &(h->cfgtable->HostWrite.CoalIntDelay));

			writel(intinfo.count,

			       &(h->cfgtable->HostWrite.CoalIntCount));

	writel(intinfo.delay, &(h->cfgtable->HostWrite.CoalIntDelay));

	writel(intinfo.count, &(h->cfgtable->HostWrite.CoalIntCount));

	writel(CFGTBL_ChangeReq, h->vaddr + SA5_DOORBELL);



	for (i = 0; i < MAX_IOCTL_CONFIG_WAIT; i++) {

				if (!(readl(h->vaddr + SA5_DOORBELL)

				      & CFGTBL_ChangeReq))

		if (!(readl(h->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))

			break;

				/* delay and try again */

				udelay(1000);

		udelay(1000); /* delay and try again */

	}

	spin_unlock_irqrestore(&h->lock, flags);

	if (i >= MAX_IOCTL_CONFIG_WAIT)

		return -EAGAIN;

	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:

		return cciss_getintinfo(h, argp);

	case CCISS_SETINTINFO:

		return cciss_setintinfo(h, argp);

	case CCISS_GETNODENAME:

		{

			NodeName_type NodeName;