RE: [PATCH 29/62] block: irq: Remove IRQF_DISABLED

[Miller, Mike (OS Dev)]

> -----Original Message-----
> From: Yong Zhang [mailto:yong.zhang0@xxxxxxxxx]
> Sent: Wednesday, September 07, 2011 3:10 AM
> To: linux-kernel@xxxxxxxxxxxxxxx
> Cc: tglx@xxxxxxxxxxxxx; mingo@xxxxxxx; Miller, Mike (OS Dev); Chirag
> Kantharia; Lucas De Marchi; Yong Zhang; Ralf Baechle; ISS StorageDev
> Subject: [PATCH 29/62] block: irq: Remove IRQF_DISABLED
> 
> This flag is a NOOP and can be removed now.
> 
> Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>

Acked-by: Mike Miller <mike.miller@xxxxxx>


> ---
>  drivers/block/cciss.c    |    4 ++--
>  drivers/block/cpqarray.c |    2 +-
>  drivers/block/hd.c       |    7 +------
>  drivers/block/mg_disk.c  |    2 +-
>  4 files changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
> index 8f4ef65..ca23653 100644
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -4844,7 +4844,7 @@ static int cciss_request_irq(ctlr_info_t *h,
>  {
>  	if (h->msix_vector || h->msi_vector) {
>  		if (!request_irq(h->intr[PERF_MODE_INT], msixhandler,
> -				IRQF_DISABLED, h->devname, h))
> +				0, h->devname, h))
>  			return 0;
>  		dev_err(&h->pdev->dev, "Unable to get msi irq %d"
>  			" for %s\n", h->intr[PERF_MODE_INT],
> @@ -4853,7 +4853,7 @@ static int cciss_request_irq(ctlr_info_t *h,
>  	}
> 
>  	if (!request_irq(h->intr[PERF_MODE_INT], intxhandler,
> -			IRQF_DISABLED, h->devname, h))
> +			0, h->devname, h))
>  		return 0;
>  	dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n",
>  		h->intr[PERF_MODE_INT], h->devname);
> diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
> index b2fceb5..33afbd7 100644
> --- a/drivers/block/cpqarray.c
> +++ b/drivers/block/cpqarray.c
> @@ -406,7 +406,7 @@ static int __devinit cpqarray_register_ctlr( int i,
> struct pci_dev *pdev)
>  	}
>  	hba[i]->access.set_intr_mask(hba[i], 0);
>  	if (request_irq(hba[i]->intr, do_ida_intr,
> -		IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
> +		IRQF_SHARED, hba[i]->devname, hba[i]))
>  	{
>  		printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
>  				hba[i]->intr, hba[i]->devname);
> diff --git a/drivers/block/hd.c b/drivers/block/hd.c
> index b52c9ca..c30d1f9 100644
> --- a/drivers/block/hd.c
> +++ b/drivers/block/hd.c
> @@ -696,11 +696,6 @@ static const struct block_device_operations hd_fops
> = {
>  };
> 
>  /*
> - * This is the hard disk IRQ description. The IRQF_DISABLED in sa_flags
> - * means we run the IRQ-handler with interrupts disabled:  this is bad
> for
> - * interrupt latency, but anything else has led to problems on some
> - * machines.
> - *
>   * We enable interrupts in some of the routines after making sure it's
>   * safe.
>   */
> @@ -762,7 +757,7 @@ static int __init hd_init(void)
>  			p->cyl, p->head, p->sect);
>  	}
> 
> -	if (request_irq(HD_IRQ, hd_interrupt, IRQF_DISABLED, "hd", NULL)) {
> +	if (request_irq(HD_IRQ, hd_interrupt, 0, "hd", NULL)) {
>  		printk("hd: unable to get IRQ%d for the hard disk driver\n",
>  			HD_IRQ);
>  		goto out1;
> diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
> index 76fa3de..3c80cba 100644
> --- a/drivers/block/mg_disk.c
> +++ b/drivers/block/mg_disk.c
> @@ -930,7 +930,7 @@ static int mg_probe(struct platform_device
> *plat_dev)
>  			goto probe_err_3b;
>  		}
>  		err = request_irq(host->irq, mg_irq,
> -				IRQF_DISABLED | IRQF_TRIGGER_RISING,
> +				IRQF_TRIGGER_RISING,
>  				MG_DEV_NAME, host);
>  		if (err) {
>  			printk(KERN_ERR "%s:%d fail (request_irq err=%d)\n",
> --
> 1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/