diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-07 04:10:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-18 04:39:36 -0400 |
commit | b5dd18d8747010e3f3eb1cc76a49f94291938559 (patch) | |
tree | 24ad7002204ff4642454ba546a8a1156231914d7 /drivers/usb/host | |
parent | 41f05dedeabb0e2cb03734de383db3f0ddecf9e0 (diff) |
USB: irq: Remove IRQF_DISABLED
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>
Diffstat (limited to 'drivers/usb/host')
41 files changed, 45 insertions, 45 deletions
diff --git a/drivers/usb/host/ehci-ath79.c b/drivers/usb/host/ehci-ath79.c index 4d2e88d04dab..afb6743cf094 100644 --- a/drivers/usb/host/ehci-ath79.c +++ b/drivers/usb/host/ehci-ath79.c | |||
@@ -163,7 +163,7 @@ static int ehci_ath79_probe(struct platform_device *pdev) | |||
163 | goto err_release_region; | 163 | goto err_release_region; |
164 | } | 164 | } |
165 | 165 | ||
166 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 166 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
167 | if (ret) | 167 | if (ret) |
168 | goto err_iounmap; | 168 | goto err_iounmap; |
169 | 169 | ||
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c index 4363fea85151..65719e8d24e4 100644 --- a/drivers/usb/host/ehci-au1xxx.c +++ b/drivers/usb/host/ehci-au1xxx.c | |||
@@ -181,7 +181,7 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev) | |||
181 | ehci->hcs_params = readl(&ehci->caps->hcs_params); | 181 | ehci->hcs_params = readl(&ehci->caps->hcs_params); |
182 | 182 | ||
183 | ret = usb_add_hcd(hcd, pdev->resource[1].start, | 183 | ret = usb_add_hcd(hcd, pdev->resource[1].start, |
184 | IRQF_DISABLED | IRQF_SHARED); | 184 | IRQF_SHARED); |
185 | if (ret == 0) { | 185 | if (ret == 0) { |
186 | platform_set_drvdata(pdev, hcd); | 186 | platform_set_drvdata(pdev, hcd); |
187 | return ret; | 187 | return ret; |
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 3bf9f16b4fd8..e90344a17631 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c | |||
@@ -134,7 +134,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
134 | 134 | ||
135 | /* Don't need to set host mode here. It will be done by tdi_reset() */ | 135 | /* Don't need to set host mode here. It will be done by tdi_reset() */ |
136 | 136 | ||
137 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 137 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); |
138 | if (retval != 0) | 138 | if (retval != 0) |
139 | goto err4; | 139 | goto err4; |
140 | 140 | ||
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index 555a73c864b5..55978fcfa4b2 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c | |||
@@ -236,7 +236,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) | |||
236 | priv->hcd = hcd; | 236 | priv->hcd = hcd; |
237 | platform_set_drvdata(pdev, priv); | 237 | platform_set_drvdata(pdev, priv); |
238 | 238 | ||
239 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 239 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
240 | if (ret) | 240 | if (ret) |
241 | goto err_add; | 241 | goto err_add; |
242 | 242 | ||
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c index c3ba3ed5f3a6..ba1f51361134 100644 --- a/drivers/usb/host/ehci-octeon.c +++ b/drivers/usb/host/ehci-octeon.c | |||
@@ -155,7 +155,7 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) | |||
155 | /* cache this readonly data; minimize chip reads */ | 155 | /* cache this readonly data; minimize chip reads */ |
156 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | 156 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); |
157 | 157 | ||
158 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 158 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
159 | if (ret) { | 159 | if (ret) { |
160 | dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret); | 160 | dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret); |
161 | goto err3; | 161 | goto err3; |
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 45240321ca09..e39b0297bad1 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c | |||
@@ -228,7 +228,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) | |||
228 | /* cache this readonly data; minimize chip reads */ | 228 | /* cache this readonly data; minimize chip reads */ |
229 | omap_ehci->hcs_params = readl(&omap_ehci->caps->hcs_params); | 229 | omap_ehci->hcs_params = readl(&omap_ehci->caps->hcs_params); |
230 | 230 | ||
231 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 231 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
232 | if (ret) { | 232 | if (ret) { |
233 | dev_err(dev, "failed to add hcd with err %d\n", ret); | 233 | dev_err(dev, "failed to add hcd with err %d\n", ret); |
234 | goto err_add_hcd; | 234 | goto err_add_hcd; |
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 395bdb0248d5..a68a2a5c4b83 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -277,7 +277,7 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) | |||
277 | printk(KERN_WARNING "Orion ehci -USB phy version isn't supported.\n"); | 277 | printk(KERN_WARNING "Orion ehci -USB phy version isn't supported.\n"); |
278 | } | 278 | } |
279 | 279 | ||
280 | err = usb_add_hcd(hcd, irq, IRQF_SHARED | IRQF_DISABLED); | 280 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); |
281 | if (err) | 281 | if (err) |
282 | goto err4; | 282 | goto err4; |
283 | 283 | ||
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c index 64626a777d61..2dc32da75cfc 100644 --- a/drivers/usb/host/ehci-ps3.c +++ b/drivers/usb/host/ehci-ps3.c | |||
@@ -167,7 +167,7 @@ static int __devinit ps3_ehci_probe(struct ps3_system_bus_device *dev) | |||
167 | 167 | ||
168 | ps3_system_bus_set_drvdata(dev, hcd); | 168 | ps3_system_bus_set_drvdata(dev, hcd); |
169 | 169 | ||
170 | result = usb_add_hcd(hcd, virq, IRQF_DISABLED); | 170 | result = usb_add_hcd(hcd, virq, 0); |
171 | 171 | ||
172 | if (result) { | 172 | if (result) { |
173 | dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", | 173 | dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", |
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 64bcf66d3040..024b65c4990d 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c | |||
@@ -136,7 +136,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) | |||
136 | /* cache this readonly data; minimize chip reads */ | 136 | /* cache this readonly data; minimize chip reads */ |
137 | ehci->hcs_params = readl(&ehci->caps->hcs_params); | 137 | ehci->hcs_params = readl(&ehci->caps->hcs_params); |
138 | 138 | ||
139 | err = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 139 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); |
140 | if (err) { | 140 | if (err) { |
141 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); | 141 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); |
142 | goto fail; | 142 | goto fail; |
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c index 86a95bb80a61..9d9cf47d80da 100644 --- a/drivers/usb/host/ehci-sh.c +++ b/drivers/usb/host/ehci-sh.c | |||
@@ -168,7 +168,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev) | |||
168 | clk_enable(priv->fclk); | 168 | clk_enable(priv->fclk); |
169 | clk_enable(priv->iclk); | 169 | clk_enable(priv->iclk); |
170 | 170 | ||
171 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 171 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
172 | if (ret != 0) { | 172 | if (ret != 0) { |
173 | dev_err(&pdev->dev, "Failed to add hcd"); | 173 | dev_err(&pdev->dev, "Failed to add hcd"); |
174 | goto fail_add_hcd; | 174 | goto fail_add_hcd; |
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c index dbf1e4ef3c17..b115b0b76e33 100644 --- a/drivers/usb/host/ehci-spear.c +++ b/drivers/usb/host/ehci-spear.c | |||
@@ -154,7 +154,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) | |||
154 | ehci->clk = usbh_clk; | 154 | ehci->clk = usbh_clk; |
155 | 155 | ||
156 | spear_start_ehci(ehci); | 156 | spear_start_ehci(ehci); |
157 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED | IRQF_DISABLED); | 157 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); |
158 | if (retval) | 158 | if (retval) |
159 | goto fail_add_hcd; | 159 | goto fail_add_hcd; |
160 | 160 | ||
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 02b2bfd49a10..db9d1b4bfbdc 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c | |||
@@ -674,7 +674,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) | |||
674 | } | 674 | } |
675 | #endif | 675 | #endif |
676 | 676 | ||
677 | err = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 677 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); |
678 | if (err) { | 678 | if (err) { |
679 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); | 679 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); |
680 | goto fail; | 680 | goto fail; |
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c index 47d749631bc7..54d1ab8aec49 100644 --- a/drivers/usb/host/ehci-vt8500.c +++ b/drivers/usb/host/ehci-vt8500.c | |||
@@ -133,7 +133,7 @@ static int vt8500_ehci_drv_probe(struct platform_device *pdev) | |||
133 | ehci_port_power(ehci, 1); | 133 | ehci_port_power(ehci, 1); |
134 | 134 | ||
135 | ret = usb_add_hcd(hcd, pdev->resource[1].start, | 135 | ret = usb_add_hcd(hcd, pdev->resource[1].start, |
136 | IRQF_DISABLED | IRQF_SHARED); | 136 | IRQF_SHARED); |
137 | if (ret == 0) { | 137 | if (ret == 0) { |
138 | platform_set_drvdata(pdev, hcd); | 138 | platform_set_drvdata(pdev, hcd); |
139 | return ret; | 139 | return ret; |
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 484a74f7553a..4ed6d19f2a54 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c | |||
@@ -689,7 +689,7 @@ static int __devinit of_fhci_probe(struct platform_device *ofdev) | |||
689 | } | 689 | } |
690 | 690 | ||
691 | ret = request_irq(fhci->timer->irq, fhci_frame_limit_timer_irq, | 691 | ret = request_irq(fhci->timer->irq, fhci_frame_limit_timer_irq, |
692 | IRQF_DISABLED, "qe timer (usb)", hcd); | 692 | 0, "qe timer (usb)", hcd); |
693 | if (ret) { | 693 | if (ret) { |
694 | dev_err(dev, "failed to request timer irq"); | 694 | dev_err(dev, "failed to request timer irq"); |
695 | goto err_timer_irq; | 695 | goto err_timer_irq; |
@@ -748,7 +748,7 @@ static int __devinit of_fhci_probe(struct platform_device *ofdev) | |||
748 | out_be16(&fhci->regs->usb_event, 0xffff); | 748 | out_be16(&fhci->regs->usb_event, 0xffff); |
749 | out_be16(&fhci->regs->usb_mask, 0); | 749 | out_be16(&fhci->regs->usb_mask, 0); |
750 | 750 | ||
751 | ret = usb_add_hcd(hcd, usb_irq, IRQF_DISABLED); | 751 | ret = usb_add_hcd(hcd, usb_irq, 0); |
752 | if (ret < 0) | 752 | if (ret < 0) |
753 | goto err_add_hcd; | 753 | goto err_add_hcd; |
754 | 754 | ||
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index af05718bdc73..2ee18cfa1efe 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c | |||
@@ -1891,7 +1891,7 @@ static int imx21_probe(struct platform_device *pdev) | |||
1891 | dev_info(imx21->dev, "Hardware HC revision: 0x%02X\n", | 1891 | dev_info(imx21->dev, "Hardware HC revision: 0x%02X\n", |
1892 | (readl(imx21->regs + USBOTG_HWMODE) >> 16) & 0xFF); | 1892 | (readl(imx21->regs + USBOTG_HWMODE) >> 16) & 0xFF); |
1893 | 1893 | ||
1894 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 1894 | ret = usb_add_hcd(hcd, irq, 0); |
1895 | if (ret != 0) { | 1895 | if (ret != 0) { |
1896 | dev_err(imx21->dev, "usb_add_hcd() returned %d\n", ret); | 1896 | dev_err(imx21->dev, "usb_add_hcd() returned %d\n", ret); |
1897 | goto failed_add_hcd; | 1897 | goto failed_add_hcd; |
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index baae4ccd16ac..d91e5f211a76 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -1639,7 +1639,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev) | |||
1639 | goto err6; | 1639 | goto err6; |
1640 | } | 1640 | } |
1641 | 1641 | ||
1642 | ret = usb_add_hcd(hcd, irq, irqflags | IRQF_DISABLED); | 1642 | ret = usb_add_hcd(hcd, irq, irqflags); |
1643 | if (ret) | 1643 | if (ret) |
1644 | goto err6; | 1644 | goto err6; |
1645 | 1645 | ||
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c index 21efca98a78c..e5fd8aa57af1 100644 --- a/drivers/usb/host/isp1362-hcd.c +++ b/drivers/usb/host/isp1362-hcd.c | |||
@@ -2773,7 +2773,7 @@ static int __devinit isp1362_probe(struct platform_device *pdev) | |||
2773 | if (irq_res->flags & IORESOURCE_IRQ_LOWLEVEL) | 2773 | if (irq_res->flags & IORESOURCE_IRQ_LOWLEVEL) |
2774 | irq_flags |= IRQF_TRIGGER_LOW; | 2774 | irq_flags |= IRQF_TRIGGER_LOW; |
2775 | 2775 | ||
2776 | retval = usb_add_hcd(hcd, irq, irq_flags | IRQF_DISABLED | IRQF_SHARED); | 2776 | retval = usb_add_hcd(hcd, irq, irq_flags | IRQF_SHARED); |
2777 | if (retval != 0) | 2777 | if (retval != 0) |
2778 | goto err6; | 2778 | goto err6; |
2779 | pr_info("%s, irq %d\n", hcd->product_desc, irq); | 2779 | pr_info("%s, irq %d\n", hcd->product_desc, irq); |
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index 7ee30056f373..d2f6b2dd7405 100644 --- a/drivers/usb/host/isp1760-if.c +++ b/drivers/usb/host/isp1760-if.c | |||
@@ -79,7 +79,7 @@ static int of_isp1760_probe(struct platform_device *dev) | |||
79 | devflags |= ISP1760_FLAG_DREQ_POL_HIGH; | 79 | devflags |= ISP1760_FLAG_DREQ_POL_HIGH; |
80 | 80 | ||
81 | hcd = isp1760_register(memory.start, res_len, virq, | 81 | hcd = isp1760_register(memory.start, res_len, virq, |
82 | IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev), | 82 | IRQF_SHARED, &dev->dev, dev_name(&dev->dev), |
83 | devflags); | 83 | devflags); |
84 | if (IS_ERR(hcd)) { | 84 | if (IS_ERR(hcd)) { |
85 | ret = PTR_ERR(hcd); | 85 | ret = PTR_ERR(hcd); |
@@ -240,7 +240,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev, | |||
240 | 240 | ||
241 | dev->dev.dma_mask = NULL; | 241 | dev->dev.dma_mask = NULL; |
242 | hcd = isp1760_register(pci_mem_phy0, memlength, dev->irq, | 242 | hcd = isp1760_register(pci_mem_phy0, memlength, dev->irq, |
243 | IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev), | 243 | IRQF_SHARED, &dev->dev, dev_name(&dev->dev), |
244 | devflags); | 244 | devflags); |
245 | if (IS_ERR(hcd)) { | 245 | if (IS_ERR(hcd)) { |
246 | ret_status = -ENODEV; | 246 | ret_status = -ENODEV; |
@@ -313,7 +313,7 @@ static int __devinit isp1760_plat_probe(struct platform_device *pdev) | |||
313 | resource_size_t mem_size; | 313 | resource_size_t mem_size; |
314 | struct isp1760_platform_data *priv = pdev->dev.platform_data; | 314 | struct isp1760_platform_data *priv = pdev->dev.platform_data; |
315 | unsigned int devflags = 0; | 315 | unsigned int devflags = 0; |
316 | unsigned long irqflags = IRQF_SHARED | IRQF_DISABLED; | 316 | unsigned long irqflags = IRQF_SHARED; |
317 | 317 | ||
318 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 318 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
319 | if (!mem_res) { | 319 | if (!mem_res) { |
diff --git a/drivers/usb/host/ohci-ath79.c b/drivers/usb/host/ohci-ath79.c index c620c50f6770..18d574d6958b 100644 --- a/drivers/usb/host/ohci-ath79.c +++ b/drivers/usb/host/ohci-ath79.c | |||
@@ -111,7 +111,7 @@ static int ohci_ath79_probe(struct platform_device *pdev) | |||
111 | 111 | ||
112 | ohci_hcd_init(hcd_to_ohci(hcd)); | 112 | ohci_hcd_init(hcd_to_ohci(hcd)); |
113 | 113 | ||
114 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 114 | ret = usb_add_hcd(hcd, irq, 0); |
115 | if (ret) | 115 | if (ret) |
116 | goto err_stop_hcd; | 116 | goto err_stop_hcd; |
117 | 117 | ||
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index 958d985f2951..6b7bc50dfeaa 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
@@ -218,7 +218,7 @@ static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev) | |||
218 | ohci_hcd_init(hcd_to_ohci(hcd)); | 218 | ohci_hcd_init(hcd_to_ohci(hcd)); |
219 | 219 | ||
220 | ret = usb_add_hcd(hcd, pdev->resource[1].start, | 220 | ret = usb_add_hcd(hcd, pdev->resource[1].start, |
221 | IRQF_DISABLED | IRQF_SHARED); | 221 | IRQF_SHARED); |
222 | if (ret == 0) { | 222 | if (ret == 0) { |
223 | platform_set_drvdata(pdev, hcd); | 223 | platform_set_drvdata(pdev, hcd); |
224 | return ret; | 224 | return ret; |
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index 6aca2c4453f7..843509778a33 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c | |||
@@ -344,7 +344,7 @@ static int usb_hcd_da8xx_probe(const struct hc_driver *driver, | |||
344 | error = -ENODEV; | 344 | error = -ENODEV; |
345 | goto err4; | 345 | goto err4; |
346 | } | 346 | } |
347 | error = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 347 | error = usb_add_hcd(hcd, irq, 0); |
348 | if (error) | 348 | if (error) |
349 | goto err4; | 349 | goto err4; |
350 | 350 | ||
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index 4e681613e7ae..dc45d489d00e 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c | |||
@@ -81,7 +81,7 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver, | |||
81 | 81 | ||
82 | ohci_hcd_init(hcd_to_ohci(hcd)); | 82 | ohci_hcd_init(hcd_to_ohci(hcd)); |
83 | 83 | ||
84 | retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED); | 84 | retval = usb_add_hcd(hcd, pdev->resource[1].start, 0); |
85 | if (retval == 0) | 85 | if (retval == 0) |
86 | return retval; | 86 | return retval; |
87 | 87 | ||
diff --git a/drivers/usb/host/ohci-octeon.c b/drivers/usb/host/ohci-octeon.c index d8b45647d1dc..d469bf9b9e54 100644 --- a/drivers/usb/host/ohci-octeon.c +++ b/drivers/usb/host/ohci-octeon.c | |||
@@ -164,7 +164,7 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev) | |||
164 | 164 | ||
165 | ohci_hcd_init(ohci); | 165 | ohci_hcd_init(ohci); |
166 | 166 | ||
167 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 167 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
168 | if (ret) { | 168 | if (ret) { |
169 | dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret); | 169 | dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret); |
170 | goto err3; | 170 | goto err3; |
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 5645f70b9214..e4b8782cc6e2 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * This file is licenced under the GPL. | 14 | * This file is licenced under the GPL. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/signal.h> /* IRQF_DISABLED */ | 17 | #include <linux/signal.h> |
18 | #include <linux/jiffies.h> | 18 | #include <linux/jiffies.h> |
19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
@@ -363,7 +363,7 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, | |||
363 | retval = -ENXIO; | 363 | retval = -ENXIO; |
364 | goto err3; | 364 | goto err3; |
365 | } | 365 | } |
366 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 366 | retval = usb_add_hcd(hcd, irq, 0); |
367 | if (retval) | 367 | if (retval) |
368 | goto err3; | 368 | goto err3; |
369 | 369 | ||
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c index 853ad8dacb7e..516ebc4d6cc2 100644 --- a/drivers/usb/host/ohci-omap3.c +++ b/drivers/usb/host/ohci-omap3.c | |||
@@ -180,7 +180,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev) | |||
180 | 180 | ||
181 | ohci_hcd_init(hcd_to_ohci(hcd)); | 181 | ohci_hcd_init(hcd_to_ohci(hcd)); |
182 | 182 | ||
183 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 183 | ret = usb_add_hcd(hcd, irq, 0); |
184 | if (ret) { | 184 | if (ret) { |
185 | dev_dbg(dev, "failed to add hcd with err %d\n", ret); | 185 | dev_dbg(dev, "failed to add hcd with err %d\n", ret); |
186 | goto err_add_hcd; | 186 | goto err_add_hcd; |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 653d6a60edb5..9ad8bee22c15 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -398,7 +398,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) | |||
398 | ohci_hcd_init(ohci); | 398 | ohci_hcd_init(ohci); |
399 | 399 | ||
400 | dev_info(&pdev->dev, "at 0x%p, irq %d\n", hcd->regs, hcd->irq); | 400 | dev_info(&pdev->dev, "at 0x%p, irq %d\n", hcd->regs, hcd->irq); |
401 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 401 | ret = usb_add_hcd(hcd, irq, 0); |
402 | if (ret == 0) | 402 | if (ret == 0) |
403 | return ret; | 403 | return ret; |
404 | 404 | ||
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c index 28467e288a93..f13d08f94d6b 100644 --- a/drivers/usb/host/ohci-pnx8550.c +++ b/drivers/usb/host/ohci-pnx8550.c | |||
@@ -107,7 +107,7 @@ int usb_hcd_pnx8550_probe (const struct hc_driver *driver, | |||
107 | 107 | ||
108 | ohci_hcd_init(hcd_to_ohci(hcd)); | 108 | ohci_hcd_init(hcd_to_ohci(hcd)); |
109 | 109 | ||
110 | retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); | 110 | retval = usb_add_hcd(hcd, dev->resource[1].start, 0); |
111 | if (retval == 0) | 111 | if (retval == 0) |
112 | return retval; | 112 | return retval; |
113 | 113 | ||
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 0c12f4e14dcd..d24cc89de16f 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
@@ -143,7 +143,7 @@ static int __devinit ohci_hcd_ppc_of_probe(struct platform_device *op) | |||
143 | 143 | ||
144 | ohci_hcd_init(ohci); | 144 | ohci_hcd_init(ohci); |
145 | 145 | ||
146 | rv = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 146 | rv = usb_add_hcd(hcd, irq, 0); |
147 | if (rv == 0) | 147 | if (rv == 0) |
148 | return 0; | 148 | return 0; |
149 | 149 | ||
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c index c0f595c44487..1514b7067470 100644 --- a/drivers/usb/host/ohci-ppc-soc.c +++ b/drivers/usb/host/ohci-ppc-soc.c | |||
@@ -80,7 +80,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, | |||
80 | #endif | 80 | #endif |
81 | ohci_hcd_init(ohci); | 81 | ohci_hcd_init(ohci); |
82 | 82 | ||
83 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 83 | retval = usb_add_hcd(hcd, irq, 0); |
84 | if (retval == 0) | 84 | if (retval == 0) |
85 | return retval; | 85 | return retval; |
86 | 86 | ||
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index 700950455f4d..6fd4fa1f19bb 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c | |||
@@ -164,7 +164,7 @@ static int __devinit ps3_ohci_probe(struct ps3_system_bus_device *dev) | |||
164 | 164 | ||
165 | ps3_system_bus_set_drvdata(dev, hcd); | 165 | ps3_system_bus_set_drvdata(dev, hcd); |
166 | 166 | ||
167 | result = usb_add_hcd(hcd, virq, IRQF_DISABLED); | 167 | result = usb_add_hcd(hcd, virq, 0); |
168 | 168 | ||
169 | if (result) { | 169 | if (result) { |
170 | dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", | 170 | dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 80be5472783a..29dfefe1c726 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -359,7 +359,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device | |||
359 | 359 | ||
360 | ohci_hcd_init(hcd_to_ohci(hcd)); | 360 | ohci_hcd_init(hcd_to_ohci(hcd)); |
361 | 361 | ||
362 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 362 | retval = usb_add_hcd(hcd, irq, 0); |
363 | if (retval == 0) | 363 | if (retval == 0) |
364 | return retval; | 364 | return retval; |
365 | 365 | ||
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 7c9a4d55526b..a1877c47601e 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
@@ -384,7 +384,7 @@ static int usb_hcd_s3c2410_probe(const struct hc_driver *driver, | |||
384 | 384 | ||
385 | ohci_hcd_init(hcd_to_ohci(hcd)); | 385 | ohci_hcd_init(hcd_to_ohci(hcd)); |
386 | 386 | ||
387 | retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); | 387 | retval = usb_add_hcd(hcd, dev->resource[1].start, 0); |
388 | if (retval != 0) | 388 | if (retval != 0) |
389 | goto err_ioremap; | 389 | goto err_ioremap; |
390 | 390 | ||
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 4204d9720d23..4bde4f9821ba 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c | |||
@@ -143,7 +143,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, | |||
143 | sa1111_start_hc(dev); | 143 | sa1111_start_hc(dev); |
144 | ohci_hcd_init(hcd_to_ohci(hcd)); | 144 | ohci_hcd_init(hcd_to_ohci(hcd)); |
145 | 145 | ||
146 | retval = usb_add_hcd(hcd, dev->irq[1], IRQF_DISABLED); | 146 | retval = usb_add_hcd(hcd, dev->irq[1], 0); |
147 | if (retval == 0) | 147 | if (retval == 0) |
148 | return retval; | 148 | return retval; |
149 | 149 | ||
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index 14cecb52a9fe..afc4eb6bb9d0 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
@@ -109,7 +109,7 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev) | |||
109 | hcd->regs = (void __iomem *)res->start; | 109 | hcd->regs = (void __iomem *)res->start; |
110 | hcd->rsrc_start = res->start; | 110 | hcd->rsrc_start = res->start; |
111 | hcd->rsrc_len = resource_size(res); | 111 | hcd->rsrc_len = resource_size(res); |
112 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 112 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
113 | if (ret != 0) { | 113 | if (ret != 0) { |
114 | err("Failed to add hcd"); | 114 | err("Failed to add hcd"); |
115 | usb_put_hcd(hcd); | 115 | usb_put_hcd(hcd); |
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index 78918ca0da23..968cea2b6d4e 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c | |||
@@ -165,7 +165,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev) | |||
165 | 165 | ||
166 | ohci_hcd_init(hcd_to_ohci(hcd)); | 166 | ohci_hcd_init(hcd_to_ohci(hcd)); |
167 | 167 | ||
168 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 168 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); |
169 | if (retval) | 169 | if (retval) |
170 | goto err5; | 170 | goto err5; |
171 | 171 | ||
diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c index 4fd4bea9ac7a..69874654f3b5 100644 --- a/drivers/usb/host/ohci-spear.c +++ b/drivers/usb/host/ohci-spear.c | |||
@@ -152,7 +152,7 @@ static int spear_ohci_hcd_drv_probe(struct platform_device *pdev) | |||
152 | spear_start_ohci(ohci_p); | 152 | spear_start_ohci(ohci_p); |
153 | ohci_hcd_init(hcd_to_ohci(hcd)); | 153 | ohci_hcd_init(hcd_to_ohci(hcd)); |
154 | 154 | ||
155 | retval = usb_add_hcd(hcd, platform_get_irq(pdev, 0), IRQF_DISABLED); | 155 | retval = usb_add_hcd(hcd, platform_get_irq(pdev, 0), 0); |
156 | if (retval == 0) | 156 | if (retval == 0) |
157 | return retval; | 157 | return retval; |
158 | 158 | ||
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c index c4aea3b8315e..5ba18595d6f7 100644 --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c | |||
@@ -169,7 +169,7 @@ static int ssb_ohci_attach(struct ssb_device *dev) | |||
169 | hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len); | 169 | hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len); |
170 | if (!hcd->regs) | 170 | if (!hcd->regs) |
171 | goto err_put_hcd; | 171 | goto err_put_hcd; |
172 | err = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED); | 172 | err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED); |
173 | if (err) | 173 | if (err) |
174 | goto err_iounmap; | 174 | goto err_iounmap; |
175 | 175 | ||
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c index 57ad1271fc9b..06331d931171 100644 --- a/drivers/usb/host/ohci-tmio.c +++ b/drivers/usb/host/ohci-tmio.c | |||
@@ -244,7 +244,7 @@ static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev) | |||
244 | ohci = hcd_to_ohci(hcd); | 244 | ohci = hcd_to_ohci(hcd); |
245 | ohci_hcd_init(ohci); | 245 | ohci_hcd_init(ohci); |
246 | 246 | ||
247 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 247 | ret = usb_add_hcd(hcd, irq, 0); |
248 | if (ret) | 248 | if (ret) |
249 | goto err_add_hcd; | 249 | goto err_add_hcd; |
250 | 250 | ||
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index a6f256436e77..e84ca1928dbf 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
@@ -2519,7 +2519,7 @@ static int __devinit r8a66597_probe(struct platform_device *pdev) | |||
2519 | hcd->rsrc_start = res->start; | 2519 | hcd->rsrc_start = res->start; |
2520 | hcd->has_tt = 1; | 2520 | hcd->has_tt = 1; |
2521 | 2521 | ||
2522 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | irq_trigger); | 2522 | ret = usb_add_hcd(hcd, irq, irq_trigger); |
2523 | if (ret != 0) { | 2523 | if (ret != 0) { |
2524 | dev_err(&pdev->dev, "Failed to add hcd\n"); | 2524 | dev_err(&pdev->dev, "Failed to add hcd\n"); |
2525 | goto clean_up3; | 2525 | goto clean_up3; |
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 1a996245ab98..961d6638d8f9 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -1729,7 +1729,7 @@ sl811h_probe(struct platform_device *dev) | |||
1729 | * Use resource IRQ flags if set by platform device setup. | 1729 | * Use resource IRQ flags if set by platform device setup. |
1730 | */ | 1730 | */ |
1731 | irqflags |= IRQF_SHARED; | 1731 | irqflags |= IRQF_SHARED; |
1732 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | irqflags); | 1732 | retval = usb_add_hcd(hcd, irq, irqflags); |
1733 | if (retval != 0) | 1733 | if (retval != 0) |
1734 | goto err6; | 1734 | goto err6; |
1735 | 1735 | ||
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 50d3fcf593ff..a1110996b76f 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c | |||
@@ -223,7 +223,7 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
223 | *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci; | 223 | *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci; |
224 | 224 | ||
225 | retval = usb_add_hcd(xhci->shared_hcd, dev->irq, | 225 | retval = usb_add_hcd(xhci->shared_hcd, dev->irq, |
226 | IRQF_DISABLED | IRQF_SHARED); | 226 | IRQF_SHARED); |
227 | if (retval) | 227 | if (retval) |
228 | goto put_usb3_hcd; | 228 | goto put_usb3_hcd; |
229 | /* Roothub already marked as USB 3.0 speed */ | 229 | /* Roothub already marked as USB 3.0 speed */ |