Skip to content

Commit

Permalink
USB: irq: Remove IRQF_DISABLED
Browse files Browse the repository at this point in the history 
This flag is a NOOP and can be removed now.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Yong Zhang authored and Greg Kroah-Hartman committed Sep 18, 2011
1 parent 41f05de commit b5dd18d
Show file tree
Hide file tree
Showing 54 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/core/hcd-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

pci_set_master(dev);

retval = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);
retval = usb_add_hcd(hcd, dev->irq, IRQF_SHARED);
if (retval != 0)
goto unmap_registers;
set_hs_companion(dev, hcd);
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/at91_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,7 @@ static int __init at91udc_probe(struct platform_device *pdev)
/* request UDC and maybe VBUS irqs */
udc->udp_irq = platform_get_irq(pdev, 0);
retval = request_irq(udc->udp_irq, at91_udc_irq,
IRQF_DISABLED, driver_name, udc);
0, driver_name, udc);
if (retval < 0) {
DBG("request irq %d failed\n", udc->udp_irq);
goto fail1;
Expand Down Expand Up @@ -1838,7 +1838,7 @@ static int __init at91udc_probe(struct platform_device *pdev)
jiffies + VBUS_POLL_TIMEOUT);
} else {
if (request_irq(udc->board.vbus_pin, at91_vbus_irq,
IRQF_DISABLED, driver_name, udc)) {
0, driver_name, udc)) {
DBG("request vbus irq %d failed\n",
udc->board.vbus_pin);
retval = -EBUSY;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/fusb300_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1469,15 +1469,15 @@ static int __init fusb300_probe(struct platform_device *pdev)
fusb300->gadget.name = udc_name;
fusb300->reg = reg;

ret = request_irq(ires->start, fusb300_irq, IRQF_DISABLED | IRQF_SHARED,
ret = request_irq(ires->start, fusb300_irq, IRQF_SHARED,
udc_name, fusb300);
if (ret < 0) {
pr_err("request_irq error (%d)\n", ret);
goto clean_up;
}

ret = request_irq(ires1->start, fusb300_irq,
IRQF_DISABLED | IRQF_SHARED, udc_name, fusb300);
IRQF_SHARED, udc_name, fusb300);
if (ret < 0) {
pr_err("request_irq1 error (%d)\n", ret);
goto clean_up;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/imx_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ static int __init imx_udc_probe(struct platform_device *pdev)

for (i = 0; i < IMX_USB_NB_EP + 1; i++) {
ret = request_irq(imx_usb->usbd_int[i], intr_handler(i),
IRQF_DISABLED, driver_name, imx_usb);
0, driver_name, imx_usb);
if (ret) {
dev_err(&pdev->dev, "can't get irq %i, err %d\n",
imx_usb->usbd_int[i], ret);
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/m66592-udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ static int __init m66592_probe(struct platform_device *pdev)
m66592->timer.data = (unsigned long)m66592;
m66592->reg = reg;

ret = request_irq(ires->start, m66592_irq, IRQF_DISABLED | IRQF_SHARED,
ret = request_irq(ires->start, m66592_irq, IRQF_SHARED,
udc_name, m66592);
if (ret < 0) {
pr_err("request_irq error (%d)\n", ret);
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/mv_udc_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2049,7 +2049,7 @@ int mv_udc_probe(struct platform_device *dev)
}
udc->irq = r->start;
if (request_irq(udc->irq, mv_udc_irq,
IRQF_DISABLED | IRQF_SHARED, driver_name, udc)) {
IRQF_SHARED, driver_name, udc)) {
dev_err(&dev->dev, "Request irq %d for UDC failed\n",
udc->irq);
retval = -ENODEV;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/omap_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2958,7 +2958,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
}
#ifdef USE_ISO
status = request_irq(pdev->resource[3].start, omap_udc_iso_irq,
IRQF_DISABLED, "omap_udc iso", udc);
0, "omap_udc iso", udc);
if (status != 0) {
ERR("can't get irq %d, err %d\n",
(int) pdev->resource[3].start, status);
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/gadget/pxa25x_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2190,7 +2190,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)

/* irq setup after old hardware state is cleaned up */
retval = request_irq(irq, pxa25x_udc_irq,
IRQF_DISABLED, driver_name, dev);
0, driver_name, dev);
if (retval != 0) {
pr_err("%s: can't get irq %d, err %d\n",
driver_name, irq, retval);
Expand All @@ -2202,7 +2202,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
if (machine_is_lubbock()) {
retval = request_irq(LUBBOCK_USB_DISC_IRQ,
lubbock_vbus_irq,
IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
IRQF_SAMPLE_RANDOM,
driver_name, dev);
if (retval != 0) {
pr_err("%s: can't get irq %i, err %d\n",
Expand All @@ -2211,7 +2211,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
}
retval = request_irq(LUBBOCK_USB_IRQ,
lubbock_vbus_irq,
IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
IRQF_SAMPLE_RANDOM,
driver_name, dev);
if (retval != 0) {
pr_err("%s: can't get irq %i, err %d\n",
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/r8a66597-udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)

disable_controller(r8a66597); /* make sure controller is disabled */

ret = request_irq(irq, r8a66597_irq, IRQF_DISABLED | IRQF_SHARED,
ret = request_irq(irq, r8a66597_irq, IRQF_SHARED,
udc_name, r8a66597);
if (ret < 0) {
printk(KERN_ERR "request_irq error (%d)\n", ret);
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/s3c2410_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1893,7 +1893,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)

/* irq setup after old hardware state is cleaned up */
retval = request_irq(IRQ_USBD, s3c2410_udc_irq,
IRQF_DISABLED, gadget_name, udc);
0, gadget_name, udc);

if (retval != 0) {
dev_err(dev, "cannot get irq %i, err %d\n", IRQ_USBD, retval);
Expand All @@ -1917,7 +1917,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
}

retval = request_irq(irq, s3c2410_udc_vbus_irq,
IRQF_DISABLED | IRQF_TRIGGER_RISING
IRQF_TRIGGER_RISING
| IRQF_TRIGGER_FALLING | IRQF_SHARED,
gadget_name, udc);

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-ath79.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static int ehci_ath79_probe(struct platform_device *pdev)
goto err_release_region;
}

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret)
goto err_iounmap;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-au1xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
ehci->hcs_params = readl(&ehci->caps->hcs_params);

ret = usb_add_hcd(hcd, pdev->resource[1].start,
IRQF_DISABLED | IRQF_SHARED);
IRQF_SHARED);
if (ret == 0) {
platform_set_drvdata(pdev, hcd);
return ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-fsl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,

/* Don't need to set host mode here. It will be done by tdi_reset() */

retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval != 0)
goto err4;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-mxc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
priv->hcd = hcd;
platform_set_drvdata(pdev, priv);

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret)
goto err_add;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-octeon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
/* cache this readonly data; minimize chip reads */
ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret) {
dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
goto err3;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
/* cache this readonly data; minimize chip reads */
omap_ehci->hcs_params = readl(&omap_ehci->caps->hcs_params);

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret) {
dev_err(dev, "failed to add hcd with err %d\n", ret);
goto err_add_hcd;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-orion.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
printk(KERN_WARNING "Orion ehci -USB phy version isn't supported.\n");
}

err = usb_add_hcd(hcd, irq, IRQF_SHARED | IRQF_DISABLED);
err = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (err)
goto err4;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-ps3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ static int __devinit ps3_ehci_probe(struct ps3_system_bus_device *dev)

ps3_system_bus_set_drvdata(dev, hcd);

result = usb_add_hcd(hcd, virq, IRQF_DISABLED);
result = usb_add_hcd(hcd, virq, 0);

if (result) {
dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n",
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-s5p.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev)
/* cache this readonly data; minimize chip reads */
ehci->hcs_params = readl(&ehci->caps->hcs_params);

err = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
err = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (err) {
dev_err(&pdev->dev, "Failed to add USB HCD\n");
goto fail;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-sh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
clk_enable(priv->fclk);
clk_enable(priv->iclk);

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret != 0) {
dev_err(&pdev->dev, "Failed to add hcd");
goto fail_add_hcd;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-spear.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev)
ehci->clk = usbh_clk;

spear_start_ehci(ehci);
retval = usb_add_hcd(hcd, irq, IRQF_SHARED | IRQF_DISABLED);
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval)
goto fail_add_hcd;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-tegra.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
}
#endif

err = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
err = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (err) {
dev_err(&pdev->dev, "Failed to add USB HCD\n");
goto fail;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-vt8500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static int vt8500_ehci_drv_probe(struct platform_device *pdev)
ehci_port_power(ehci, 1);

ret = usb_add_hcd(hcd, pdev->resource[1].start,
IRQF_DISABLED | IRQF_SHARED);
IRQF_SHARED);
if (ret == 0) {
platform_set_drvdata(pdev, hcd);
return ret;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/host/fhci-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ static int __devinit of_fhci_probe(struct platform_device *ofdev)
}

ret = request_irq(fhci->timer->irq, fhci_frame_limit_timer_irq,
IRQF_DISABLED, "qe timer (usb)", hcd);
0, "qe timer (usb)", hcd);
if (ret) {
dev_err(dev, "failed to request timer irq");
goto err_timer_irq;
Expand Down Expand Up @@ -748,7 +748,7 @@ static int __devinit of_fhci_probe(struct platform_device *ofdev)
out_be16(&fhci->regs->usb_event, 0xffff);
out_be16(&fhci->regs->usb_mask, 0);

ret = usb_add_hcd(hcd, usb_irq, IRQF_DISABLED);
ret = usb_add_hcd(hcd, usb_irq, 0);
if (ret < 0)
goto err_add_hcd;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/imx21-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1891,7 +1891,7 @@ static int imx21_probe(struct platform_device *pdev)
dev_info(imx21->dev, "Hardware HC revision: 0x%02X\n",
(readl(imx21->regs + USBOTG_HWMODE) >> 16) & 0xFF);

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
ret = usb_add_hcd(hcd, irq, 0);
if (ret != 0) {
dev_err(imx21->dev, "usb_add_hcd() returned %d\n", ret);
goto failed_add_hcd;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/isp116x-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev)
goto err6;
}

ret = usb_add_hcd(hcd, irq, irqflags | IRQF_DISABLED);
ret = usb_add_hcd(hcd, irq, irqflags);
if (ret)
goto err6;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/isp1362-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,7 @@ static int __devinit isp1362_probe(struct platform_device *pdev)
if (irq_res->flags & IORESOURCE_IRQ_LOWLEVEL)
irq_flags |= IRQF_TRIGGER_LOW;

retval = usb_add_hcd(hcd, irq, irq_flags | IRQF_DISABLED | IRQF_SHARED);
retval = usb_add_hcd(hcd, irq, irq_flags | IRQF_SHARED);
if (retval != 0)
goto err6;
pr_info("%s, irq %d\n", hcd->product_desc, irq);
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/host/isp1760-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static int of_isp1760_probe(struct platform_device *dev)
devflags |= ISP1760_FLAG_DREQ_POL_HIGH;

hcd = isp1760_register(memory.start, res_len, virq,
IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev),
IRQF_SHARED, &dev->dev, dev_name(&dev->dev),
devflags);
if (IS_ERR(hcd)) {
ret = PTR_ERR(hcd);
Expand Down Expand Up @@ -240,7 +240,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev,

dev->dev.dma_mask = NULL;
hcd = isp1760_register(pci_mem_phy0, memlength, dev->irq,
IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev),
IRQF_SHARED, &dev->dev, dev_name(&dev->dev),
devflags);
if (IS_ERR(hcd)) {
ret_status = -ENODEV;
Expand Down Expand Up @@ -313,7 +313,7 @@ static int __devinit isp1760_plat_probe(struct platform_device *pdev)
resource_size_t mem_size;
struct isp1760_platform_data *priv = pdev->dev.platform_data;
unsigned int devflags = 0;
unsigned long irqflags = IRQF_SHARED | IRQF_DISABLED;
unsigned long irqflags = IRQF_SHARED;

mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem_res) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-ath79.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static int ohci_ath79_probe(struct platform_device *pdev)

ohci_hcd_init(hcd_to_ohci(hcd));

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
ret = usb_add_hcd(hcd, irq, 0);
if (ret)
goto err_stop_hcd;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-au1xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
ohci_hcd_init(hcd_to_ohci(hcd));

ret = usb_add_hcd(hcd, pdev->resource[1].start,
IRQF_DISABLED | IRQF_SHARED);
IRQF_SHARED);
if (ret == 0) {
platform_set_drvdata(pdev, hcd);
return ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-da8xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static int usb_hcd_da8xx_probe(const struct hc_driver *driver,
error = -ENODEV;
goto err4;
}
error = usb_add_hcd(hcd, irq, IRQF_DISABLED);
error = usb_add_hcd(hcd, irq, 0);
if (error)
goto err4;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-ep93xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,

ohci_hcd_init(hcd_to_ohci(hcd));

retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED);
retval = usb_add_hcd(hcd, pdev->resource[1].start, 0);
if (retval == 0)
return retval;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-octeon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)

ohci_hcd_init(ohci);

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret) {
dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
goto err3;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/host/ohci-omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* This file is licenced under the GPL.
*/

#include <linux/signal.h> /* IRQF_DISABLED */
#include <linux/signal.h>
#include <linux/jiffies.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
Expand Down Expand Up @@ -363,7 +363,7 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
retval = -ENXIO;
goto err3;
}
retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);
retval = usb_add_hcd(hcd, irq, 0);
if (retval)
goto err3;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-omap3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)

ohci_hcd_init(hcd_to_ohci(hcd));

ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
ret = usb_add_hcd(hcd, irq, 0);
if (ret) {
dev_dbg(dev, "failed to add hcd with err %d\n", ret);
goto err_add_hcd;
Expand Down
Loading

0 comments on commit b5dd18d

Please sign in to comment.