Skip to content

Commit

Permalink
[PATCH] irq-flags: usb: Use the new IRQF_ constants
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jul 2, 2006
1 parent 40663cc commit d54b5ca
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 25 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 @@ -125,7 +125,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, SA_SHIRQ);
retval = usb_add_hcd (hcd, dev->irq, IRQF_SHARED);
if (retval != 0)
goto err4;
return retval;
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 @@ -1653,13 +1653,13 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
pullup(udc, 0);

/* request UDC and maybe VBUS irqs */
if (request_irq(AT91_ID_UDP, at91_udc_irq, SA_INTERRUPT, driver_name, udc)) {
if (request_irq(AT91_ID_UDP, at91_udc_irq, IRQF_DISABLED, driver_name, udc)) {
DBG("request irq %d failed\n", AT91_ID_UDP);
retval = -EBUSY;
goto fail1;
}
if (udc->board.vbus_pin > 0) {
if (request_irq(udc->board.vbus_pin, at91_vbus_irq, SA_INTERRUPT, driver_name, udc)) {
if (request_irq(udc->board.vbus_pin, at91_vbus_irq, IRQF_DISABLED, driver_name, udc)) {
DBG("request vbus irq %d failed\n", udc->board.vbus_pin);
free_irq(AT91_ID_UDP, udc);
retval = -EBUSY;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/goku_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1916,7 +1916,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* init to known state, then setup irqs */
udc_reset(dev);
udc_reinit (dev);
if (request_irq(pdev->irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/,
if (request_irq(pdev->irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/,
driver_name, dev) != 0) {
DBG(dev, "request interrupt %d failed\n", pdev->irq);
retval = -EBUSY;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/lh7a40x_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,7 @@ static int lh7a40x_udc_probe(struct platform_device *pdev)

/* irq setup after old hardware state is cleaned up */
retval =
request_irq(IRQ_USBINTR, lh7a40x_udc_irq, SA_INTERRUPT, driver_name,
request_irq(IRQ_USBINTR, lh7a40x_udc_irq, IRQF_DISABLED, driver_name,
dev);
if (retval != 0) {
DEBUG(KERN_ERR "%s: can't get irq %i, err %d\n", driver_name,
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/net2280.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2895,7 +2895,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
goto done;
}

if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev)
if (request_irq (pdev->irq, net2280_irq, IRQF_SHARED, driver_name, dev)
!= 0) {
ERROR (dev, "request interrupt %d failed\n", pdev->irq);
retval = -EBUSY;
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/gadget/omap_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2818,7 +2818,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)

/* USB general purpose IRQ: ep0, state changes, dma, etc */
status = request_irq(pdev->resource[1].start, omap_udc_irq,
SA_SAMPLE_RANDOM, driver_name, udc);
IRQF_SAMPLE_RANDOM, driver_name, udc);
if (status != 0) {
ERR( "can't get irq %ld, err %d\n",
pdev->resource[1].start, status);
Expand All @@ -2827,15 +2827,15 @@ static int __init omap_udc_probe(struct platform_device *pdev)

/* USB "non-iso" IRQ (PIO for all but ep0) */
status = request_irq(pdev->resource[2].start, omap_udc_pio_irq,
SA_SAMPLE_RANDOM, "omap_udc pio", udc);
IRQF_SAMPLE_RANDOM, "omap_udc pio", udc);
if (status != 0) {
ERR( "can't get irq %ld, err %d\n",
pdev->resource[2].start, status);
goto cleanup2;
}
#ifdef USE_ISO
status = request_irq(pdev->resource[3].start, omap_udc_iso_irq,
SA_INTERRUPT, "omap_udc iso", udc);
IRQF_DISABLED, "omap_udc iso", udc);
if (status != 0) {
ERR("can't get irq %ld, err %d\n",
pdev->resource[3].start, status);
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/gadget/pxa2xx_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2521,7 +2521,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)

/* irq setup after old hardware state is cleaned up */
retval = request_irq(IRQ_USB, pxa2xx_udc_irq,
SA_INTERRUPT, driver_name, dev);
IRQF_DISABLED, driver_name, dev);
if (retval != 0) {
printk(KERN_ERR "%s: can't get irq %i, err %d\n",
driver_name, IRQ_USB, retval);
Expand All @@ -2533,7 +2533,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
if (machine_is_lubbock()) {
retval = request_irq(LUBBOCK_USB_DISC_IRQ,
lubbock_vbus_irq,
SA_INTERRUPT | SA_SAMPLE_RANDOM,
IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
driver_name, dev);
if (retval != 0) {
printk(KERN_ERR "%s: can't get irq %i, err %d\n",
Expand All @@ -2544,7 +2544,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
}
retval = request_irq(LUBBOCK_USB_IRQ,
lubbock_vbus_irq,
SA_INTERRUPT | SA_SAMPLE_RANDOM,
IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
driver_name, dev);
if (retval != 0) {
printk(KERN_ERR "%s: can't get irq %i, err %d\n",
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 @@ -148,7 +148,7 @@ int usb_ehci_au1xxx_probe(const struct hc_driver *driver,
/* ehci_hcd_init(hcd_to_ehci(hcd)); */

retval =
usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT | SA_SHIRQ);
usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED);
if (retval == 0)
return retval;

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 @@ -121,7 +121,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver,
temp = in_le32(hcd->regs + 0x1a8);
out_le32(hcd->regs + 0x1a8, temp | 0x3);

retval = usb_add_hcd(hcd, irq, SA_SHIRQ);
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval != 0)
goto err4;
return retval;
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 @@ -1653,7 +1653,7 @@ static int __init isp116x_probe(struct platform_device *pdev)
goto err6;
}

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-at91.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ int usb_hcd_at91_probe (const struct hc_driver *driver, struct platform_device *
at91_start_hc(pdev);
ohci_hcd_init(hcd_to_ohci(hcd));

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

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 @@ -191,7 +191,7 @@ static int usb_ohci_au1xxx_probe(const struct hc_driver *driver,
au1xxx_start_ohc(dev);
ohci_hcd_init(hcd_to_ohci(hcd));

retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT | SA_SHIRQ);
retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED);
if (retval == 0)
return retval;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-lh7a404.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ int usb_hcd_lh7a404_probe (const struct hc_driver *driver,
lh7a404_start_hc(dev);
ohci_hcd_init(hcd_to_ohci(hcd));

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

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> /* SA_INTERRUPT */
#include <linux/signal.h> /* IRQF_DISABLED */
#include <linux/jiffies.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
Expand Down Expand Up @@ -334,7 +334,7 @@ int usb_hcd_omap_probe (const struct hc_driver *driver,
retval = -ENXIO;
goto err2;
}
retval = usb_add_hcd(hcd, irq, SA_INTERRUPT);
retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);
if (retval == 0)
return retval;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-ppc-soc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
ohci->flags |= OHCI_BIG_ENDIAN;
ohci_hcd_init(ohci);

retval = usb_add_hcd(hcd, irq, SA_INTERRUPT);
retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);
if (retval == 0)
return retval;

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

ohci_hcd_init(hcd_to_ohci(hcd));

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

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

ohci_hcd_init(hcd_to_ohci(hcd));

retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT);
retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED);
if (retval != 0)
goto err_ioremap;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ohci-sa1111.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver,
sa1111_start_hc(dev);
ohci_hcd_init(hcd_to_ohci(hcd));

retval = usb_add_hcd(hcd, dev->irq[1], SA_INTERRUPT);
retval = usb_add_hcd(hcd, dev->irq[1], IRQF_DISABLED);
if (retval == 0)
return retval;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/sl811-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@ sl811h_probe(struct platform_device *dev)
* was on a system with single edge triggering, so most sorts of
* triggering arrangement should work.
*/
retval = usb_add_hcd(hcd, irq, SA_INTERRUPT | SA_SHIRQ);
retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
if (retval != 0)
goto err6;

Expand Down

0 comments on commit d54b5ca

Please sign in to comment.