diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:53 -0400 |
commit | d54b5caa832caa3715a458115b6ea79ad17c4f31 (patch) | |
tree | cba8510790089acd4a14dee59a39a24c88669b9a /drivers/usb | |
parent | 40663cc7f1c1ccf515d8af9470925a0cb2f59b5d (diff) |
[PATCH] irq-flags: usb: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/hcd-pci.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/at91_udc.c | 4 | ||||
-rw-r--r-- | drivers/usb/gadget/goku_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/lh7a40x_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/net2280.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 6 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 6 | ||||
-rw-r--r-- | drivers/usb/host/ehci-au1xxx.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-fsl.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-at91.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-au1xxx.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-lh7a404.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-omap.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-ppc-soc.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-sa1111.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/sl811-hcd.c | 2 |
19 files changed, 25 insertions, 25 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 9d16716d166..5078fb3375e 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c | |||
@@ -125,7 +125,7 @@ int usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id) | |||
125 | 125 | ||
126 | pci_set_master (dev); | 126 | pci_set_master (dev); |
127 | 127 | ||
128 | retval = usb_add_hcd (hcd, dev->irq, SA_SHIRQ); | 128 | retval = usb_add_hcd (hcd, dev->irq, IRQF_SHARED); |
129 | if (retval != 0) | 129 | if (retval != 0) |
130 | goto err4; | 130 | goto err4; |
131 | return retval; | 131 | return retval; |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index acb3c3d2e88..1c459ff037c 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -1653,13 +1653,13 @@ static int __devinit at91udc_probe(struct platform_device *pdev) | |||
1653 | pullup(udc, 0); | 1653 | pullup(udc, 0); |
1654 | 1654 | ||
1655 | /* request UDC and maybe VBUS irqs */ | 1655 | /* request UDC and maybe VBUS irqs */ |
1656 | if (request_irq(AT91_ID_UDP, at91_udc_irq, SA_INTERRUPT, driver_name, udc)) { | 1656 | if (request_irq(AT91_ID_UDP, at91_udc_irq, IRQF_DISABLED, driver_name, udc)) { |
1657 | DBG("request irq %d failed\n", AT91_ID_UDP); | 1657 | DBG("request irq %d failed\n", AT91_ID_UDP); |
1658 | retval = -EBUSY; | 1658 | retval = -EBUSY; |
1659 | goto fail1; | 1659 | goto fail1; |
1660 | } | 1660 | } |
1661 | if (udc->board.vbus_pin > 0) { | 1661 | if (udc->board.vbus_pin > 0) { |
1662 | if (request_irq(udc->board.vbus_pin, at91_vbus_irq, SA_INTERRUPT, driver_name, udc)) { | 1662 | if (request_irq(udc->board.vbus_pin, at91_vbus_irq, IRQF_DISABLED, driver_name, udc)) { |
1663 | DBG("request vbus irq %d failed\n", udc->board.vbus_pin); | 1663 | DBG("request vbus irq %d failed\n", udc->board.vbus_pin); |
1664 | free_irq(AT91_ID_UDP, udc); | 1664 | free_irq(AT91_ID_UDP, udc); |
1665 | retval = -EBUSY; | 1665 | retval = -EBUSY; |
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index 3f827ded8cd..7cf2999e861 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c | |||
@@ -1916,7 +1916,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1916 | /* init to known state, then setup irqs */ | 1916 | /* init to known state, then setup irqs */ |
1917 | udc_reset(dev); | 1917 | udc_reset(dev); |
1918 | udc_reinit (dev); | 1918 | udc_reinit (dev); |
1919 | if (request_irq(pdev->irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/, | 1919 | if (request_irq(pdev->irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/, |
1920 | driver_name, dev) != 0) { | 1920 | driver_name, dev) != 0) { |
1921 | DBG(dev, "request interrupt %d failed\n", pdev->irq); | 1921 | DBG(dev, "request interrupt %d failed\n", pdev->irq); |
1922 | retval = -EBUSY; | 1922 | retval = -EBUSY; |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index 0d3424eda03..bb22b7e8287 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
@@ -2107,7 +2107,7 @@ static int lh7a40x_udc_probe(struct platform_device *pdev) | |||
2107 | 2107 | ||
2108 | /* irq setup after old hardware state is cleaned up */ | 2108 | /* irq setup after old hardware state is cleaned up */ |
2109 | retval = | 2109 | retval = |
2110 | request_irq(IRQ_USBINTR, lh7a40x_udc_irq, SA_INTERRUPT, driver_name, | 2110 | request_irq(IRQ_USBINTR, lh7a40x_udc_irq, IRQF_DISABLED, driver_name, |
2111 | dev); | 2111 | dev); |
2112 | if (retval != 0) { | 2112 | if (retval != 0) { |
2113 | DEBUG(KERN_ERR "%s: can't get irq %i, err %d\n", driver_name, | 2113 | DEBUG(KERN_ERR "%s: can't get irq %i, err %d\n", driver_name, |
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 570996d7eb3..09243239d94 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
@@ -2895,7 +2895,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) | |||
2895 | goto done; | 2895 | goto done; |
2896 | } | 2896 | } |
2897 | 2897 | ||
2898 | if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev) | 2898 | if (request_irq (pdev->irq, net2280_irq, IRQF_SHARED, driver_name, dev) |
2899 | != 0) { | 2899 | != 0) { |
2900 | ERROR (dev, "request interrupt %d failed\n", pdev->irq); | 2900 | ERROR (dev, "request interrupt %d failed\n", pdev->irq); |
2901 | retval = -EBUSY; | 2901 | retval = -EBUSY; |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 0d642ac7005..f28ebbc048d 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -2818,7 +2818,7 @@ bad_on_1710: | |||
2818 | 2818 | ||
2819 | /* USB general purpose IRQ: ep0, state changes, dma, etc */ | 2819 | /* USB general purpose IRQ: ep0, state changes, dma, etc */ |
2820 | status = request_irq(pdev->resource[1].start, omap_udc_irq, | 2820 | status = request_irq(pdev->resource[1].start, omap_udc_irq, |
2821 | SA_SAMPLE_RANDOM, driver_name, udc); | 2821 | IRQF_SAMPLE_RANDOM, driver_name, udc); |
2822 | if (status != 0) { | 2822 | if (status != 0) { |
2823 | ERR( "can't get irq %ld, err %d\n", | 2823 | ERR( "can't get irq %ld, err %d\n", |
2824 | pdev->resource[1].start, status); | 2824 | pdev->resource[1].start, status); |
@@ -2827,7 +2827,7 @@ bad_on_1710: | |||
2827 | 2827 | ||
2828 | /* USB "non-iso" IRQ (PIO for all but ep0) */ | 2828 | /* USB "non-iso" IRQ (PIO for all but ep0) */ |
2829 | status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, | 2829 | status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, |
2830 | SA_SAMPLE_RANDOM, "omap_udc pio", udc); | 2830 | IRQF_SAMPLE_RANDOM, "omap_udc pio", udc); |
2831 | if (status != 0) { | 2831 | if (status != 0) { |
2832 | ERR( "can't get irq %ld, err %d\n", | 2832 | ERR( "can't get irq %ld, err %d\n", |
2833 | pdev->resource[2].start, status); | 2833 | pdev->resource[2].start, status); |
@@ -2835,7 +2835,7 @@ bad_on_1710: | |||
2835 | } | 2835 | } |
2836 | #ifdef USE_ISO | 2836 | #ifdef USE_ISO |
2837 | status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, | 2837 | status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, |
2838 | SA_INTERRUPT, "omap_udc iso", udc); | 2838 | IRQF_DISABLED, "omap_udc iso", udc); |
2839 | if (status != 0) { | 2839 | if (status != 0) { |
2840 | ERR("can't get irq %ld, err %d\n", | 2840 | ERR("can't get irq %ld, err %d\n", |
2841 | pdev->resource[3].start, status); | 2841 | pdev->resource[3].start, status); |
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index c88650dffde..fff027d30a0 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
@@ -2521,7 +2521,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev) | |||
2521 | 2521 | ||
2522 | /* irq setup after old hardware state is cleaned up */ | 2522 | /* irq setup after old hardware state is cleaned up */ |
2523 | retval = request_irq(IRQ_USB, pxa2xx_udc_irq, | 2523 | retval = request_irq(IRQ_USB, pxa2xx_udc_irq, |
2524 | SA_INTERRUPT, driver_name, dev); | 2524 | IRQF_DISABLED, driver_name, dev); |
2525 | if (retval != 0) { | 2525 | if (retval != 0) { |
2526 | printk(KERN_ERR "%s: can't get irq %i, err %d\n", | 2526 | printk(KERN_ERR "%s: can't get irq %i, err %d\n", |
2527 | driver_name, IRQ_USB, retval); | 2527 | driver_name, IRQ_USB, retval); |
@@ -2533,7 +2533,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev) | |||
2533 | if (machine_is_lubbock()) { | 2533 | if (machine_is_lubbock()) { |
2534 | retval = request_irq(LUBBOCK_USB_DISC_IRQ, | 2534 | retval = request_irq(LUBBOCK_USB_DISC_IRQ, |
2535 | lubbock_vbus_irq, | 2535 | lubbock_vbus_irq, |
2536 | SA_INTERRUPT | SA_SAMPLE_RANDOM, | 2536 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, |
2537 | driver_name, dev); | 2537 | driver_name, dev); |
2538 | if (retval != 0) { | 2538 | if (retval != 0) { |
2539 | printk(KERN_ERR "%s: can't get irq %i, err %d\n", | 2539 | printk(KERN_ERR "%s: can't get irq %i, err %d\n", |
@@ -2544,7 +2544,7 @@ lubbock_fail0: | |||
2544 | } | 2544 | } |
2545 | retval = request_irq(LUBBOCK_USB_IRQ, | 2545 | retval = request_irq(LUBBOCK_USB_IRQ, |
2546 | lubbock_vbus_irq, | 2546 | lubbock_vbus_irq, |
2547 | SA_INTERRUPT | SA_SAMPLE_RANDOM, | 2547 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, |
2548 | driver_name, dev); | 2548 | driver_name, dev); |
2549 | if (retval != 0) { | 2549 | if (retval != 0) { |
2550 | printk(KERN_ERR "%s: can't get irq %i, err %d\n", | 2550 | printk(KERN_ERR "%s: can't get irq %i, err %d\n", |
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c index 9b4697add31..d66867aa527 100644 --- a/drivers/usb/host/ehci-au1xxx.c +++ b/drivers/usb/host/ehci-au1xxx.c | |||
@@ -148,7 +148,7 @@ int usb_ehci_au1xxx_probe(const struct hc_driver *driver, | |||
148 | /* ehci_hcd_init(hcd_to_ehci(hcd)); */ | 148 | /* ehci_hcd_init(hcd_to_ehci(hcd)); */ |
149 | 149 | ||
150 | retval = | 150 | retval = |
151 | usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT | SA_SHIRQ); | 151 | usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED); |
152 | if (retval == 0) | 152 | if (retval == 0) |
153 | return retval; | 153 | return retval; |
154 | 154 | ||
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index a49a689bf42..d030516edfb 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c | |||
@@ -121,7 +121,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
121 | temp = in_le32(hcd->regs + 0x1a8); | 121 | temp = in_le32(hcd->regs + 0x1a8); |
122 | out_le32(hcd->regs + 0x1a8, temp | 0x3); | 122 | out_le32(hcd->regs + 0x1a8, temp | 0x3); |
123 | 123 | ||
124 | retval = usb_add_hcd(hcd, irq, SA_SHIRQ); | 124 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); |
125 | if (retval != 0) | 125 | if (retval != 0) |
126 | goto err4; | 126 | goto err4; |
127 | return retval; | 127 | return retval; |
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 14386254c87..5147ed4a666 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -1653,7 +1653,7 @@ static int __init isp116x_probe(struct platform_device *pdev) | |||
1653 | goto err6; | 1653 | goto err6; |
1654 | } | 1654 | } |
1655 | 1655 | ||
1656 | ret = usb_add_hcd(hcd, irq, SA_INTERRUPT); | 1656 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); |
1657 | if (ret) | 1657 | if (ret) |
1658 | goto err6; | 1658 | goto err6; |
1659 | 1659 | ||
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 6b7350b5241..cdbafb71000 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
@@ -125,7 +125,7 @@ int usb_hcd_at91_probe (const struct hc_driver *driver, struct platform_device * | |||
125 | at91_start_hc(pdev); | 125 | at91_start_hc(pdev); |
126 | ohci_hcd_init(hcd_to_ohci(hcd)); | 126 | ohci_hcd_init(hcd_to_ohci(hcd)); |
127 | 127 | ||
128 | retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); | 128 | retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED); |
129 | if (retval == 0) | 129 | if (retval == 0) |
130 | return retval; | 130 | return retval; |
131 | 131 | ||
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index a1c8b3b2fcc..689261e4401 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
@@ -191,7 +191,7 @@ static int usb_ohci_au1xxx_probe(const struct hc_driver *driver, | |||
191 | au1xxx_start_ohc(dev); | 191 | au1xxx_start_ohc(dev); |
192 | ohci_hcd_init(hcd_to_ohci(hcd)); | 192 | ohci_hcd_init(hcd_to_ohci(hcd)); |
193 | 193 | ||
194 | retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT | SA_SHIRQ); | 194 | retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED); |
195 | if (retval == 0) | 195 | if (retval == 0) |
196 | return retval; | 196 | return retval; |
197 | 197 | ||
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 0020ed7a39d..5602da9bd52 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c | |||
@@ -100,7 +100,7 @@ int usb_hcd_lh7a404_probe (const struct hc_driver *driver, | |||
100 | lh7a404_start_hc(dev); | 100 | lh7a404_start_hc(dev); |
101 | ohci_hcd_init(hcd_to_ohci(hcd)); | 101 | ohci_hcd_init(hcd_to_ohci(hcd)); |
102 | 102 | ||
103 | retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT); | 103 | retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); |
104 | if (retval == 0) | 104 | if (retval == 0) |
105 | return retval; | 105 | return retval; |
106 | 106 | ||
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index ca19abe01c5..c4c4babd476 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> /* SA_INTERRUPT */ | 17 | #include <linux/signal.h> /* IRQF_DISABLED */ |
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> |
@@ -334,7 +334,7 @@ int usb_hcd_omap_probe (const struct hc_driver *driver, | |||
334 | retval = -ENXIO; | 334 | retval = -ENXIO; |
335 | goto err2; | 335 | goto err2; |
336 | } | 336 | } |
337 | retval = usb_add_hcd(hcd, irq, SA_INTERRUPT); | 337 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); |
338 | if (retval == 0) | 338 | if (retval == 0) |
339 | return retval; | 339 | return retval; |
340 | 340 | ||
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c index b2a8dfa4887..9fe56ff1615 100644 --- a/drivers/usb/host/ohci-ppc-soc.c +++ b/drivers/usb/host/ohci-ppc-soc.c | |||
@@ -75,7 +75,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver, | |||
75 | ohci->flags |= OHCI_BIG_ENDIAN; | 75 | ohci->flags |= OHCI_BIG_ENDIAN; |
76 | ohci_hcd_init(ohci); | 76 | ohci_hcd_init(ohci); |
77 | 77 | ||
78 | retval = usb_add_hcd(hcd, irq, SA_INTERRUPT); | 78 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); |
79 | if (retval == 0) | 79 | if (retval == 0) |
80 | return retval; | 80 | return retval; |
81 | 81 | ||
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index fafe7c1265b..6f559e10278 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -190,7 +190,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device | |||
190 | 190 | ||
191 | ohci_hcd_init(hcd_to_ohci(hcd)); | 191 | ohci_hcd_init(hcd_to_ohci(hcd)); |
192 | 192 | ||
193 | retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); | 193 | retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED); |
194 | if (retval == 0) | 194 | if (retval == 0) |
195 | return retval; | 195 | return retval; |
196 | 196 | ||
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 1da5de573a6..d2fc6969a9f 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
@@ -388,7 +388,7 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver, | |||
388 | 388 | ||
389 | ohci_hcd_init(hcd_to_ohci(hcd)); | 389 | ohci_hcd_init(hcd_to_ohci(hcd)); |
390 | 390 | ||
391 | retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT); | 391 | retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); |
392 | if (retval != 0) | 392 | if (retval != 0) |
393 | goto err_ioremap; | 393 | goto err_ioremap; |
394 | 394 | ||
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index fb3221ebbb2..ce3de106cad 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], SA_INTERRUPT); | 146 | retval = usb_add_hcd(hcd, dev->irq[1], IRQF_DISABLED); |
147 | if (retval == 0) | 147 | if (retval == 0) |
148 | return retval; | 148 | return retval; |
149 | 149 | ||
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index c327168255c..fa34092bbcd 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -1749,7 +1749,7 @@ sl811h_probe(struct platform_device *dev) | |||
1749 | * was on a system with single edge triggering, so most sorts of | 1749 | * was on a system with single edge triggering, so most sorts of |
1750 | * triggering arrangement should work. | 1750 | * triggering arrangement should work. |
1751 | */ | 1751 | */ |
1752 | retval = usb_add_hcd(hcd, irq, SA_INTERRUPT | SA_SHIRQ); | 1752 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); |
1753 | if (retval != 0) | 1753 | if (retval != 0) |
1754 | goto err6; | 1754 | goto err6; |
1755 | 1755 | ||