tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Thomas Gleixner and committed by
Linus Torvalds d54b5caa 40663cc7

+25 -25
unified split
+1 -1
drivers/usb/core/hcd-pci.c
··· 125 126 pci_set_master (dev); 127 128 - retval = usb_add_hcd (hcd, dev->irq, SA_SHIRQ); 129 if (retval != 0) 130 goto err4; 131 return retval;
··· 125 126 pci_set_master (dev); 127 128 + retval = usb_add_hcd (hcd, dev->irq, IRQF_SHARED); 129 if (retval != 0) 130 goto err4; 131 return retval;
+2 -2
drivers/usb/gadget/at91_udc.c
··· 1653 pullup(udc, 0); 1654 1655 /* request UDC and maybe VBUS irqs */ 1656 - if (request_irq(AT91_ID_UDP, at91_udc_irq, SA_INTERRUPT, driver_name, udc)) { 1657 DBG("request irq %d failed\n", AT91_ID_UDP); 1658 retval = -EBUSY; 1659 goto fail1; 1660 } 1661 if (udc->board.vbus_pin > 0) { 1662 - if (request_irq(udc->board.vbus_pin, at91_vbus_irq, SA_INTERRUPT, driver_name, udc)) { 1663 DBG("request vbus irq %d failed\n", udc->board.vbus_pin); 1664 free_irq(AT91_ID_UDP, udc); 1665 retval = -EBUSY;
··· 1653 pullup(udc, 0); 1654 1655 /* request UDC and maybe VBUS irqs */ 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); 1658 retval = -EBUSY; 1659 goto fail1; 1660 } 1661 if (udc->board.vbus_pin > 0) { 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); 1664 free_irq(AT91_ID_UDP, udc); 1665 retval = -EBUSY;
+1 -1
drivers/usb/gadget/goku_udc.c
··· 1916 /* init to known state, then setup irqs */ 1917 udc_reset(dev); 1918 udc_reinit (dev); 1919 - if (request_irq(pdev->irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/, 1920 driver_name, dev) != 0) { 1921 DBG(dev, "request interrupt %d failed\n", pdev->irq); 1922 retval = -EBUSY;
··· 1916 /* init to known state, then setup irqs */ 1917 udc_reset(dev); 1918 udc_reinit (dev); 1919 + if (request_irq(pdev->irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/, 1920 driver_name, dev) != 0) { 1921 DBG(dev, "request interrupt %d failed\n", pdev->irq); 1922 retval = -EBUSY;
+1 -1
drivers/usb/gadget/lh7a40x_udc.c
··· 2107 2108 /* irq setup after old hardware state is cleaned up */ 2109 retval = 2110 - request_irq(IRQ_USBINTR, lh7a40x_udc_irq, SA_INTERRUPT, driver_name, 2111 dev); 2112 if (retval != 0) { 2113 DEBUG(KERN_ERR "%s: can't get irq %i, err %d\n", driver_name,
··· 2107 2108 /* irq setup after old hardware state is cleaned up */ 2109 retval = 2110 + request_irq(IRQ_USBINTR, lh7a40x_udc_irq, IRQF_DISABLED, driver_name, 2111 dev); 2112 if (retval != 0) { 2113 DEBUG(KERN_ERR "%s: can't get irq %i, err %d\n", driver_name,
+1 -1
drivers/usb/gadget/net2280.c
··· 2895 goto done; 2896 } 2897 2898 - if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev) 2899 != 0) { 2900 ERROR (dev, "request interrupt %d failed\n", pdev->irq); 2901 retval = -EBUSY;
··· 2895 goto done; 2896 } 2897 2898 + if (request_irq (pdev->irq, net2280_irq, IRQF_SHARED, driver_name, dev) 2899 != 0) { 2900 ERROR (dev, "request interrupt %d failed\n", pdev->irq); 2901 retval = -EBUSY;
+3 -3
drivers/usb/gadget/omap_udc.c
··· 2818 2819 /* USB general purpose IRQ: ep0, state changes, dma, etc */ 2820 status = request_irq(pdev->resource[1].start, omap_udc_irq, 2821 - SA_SAMPLE_RANDOM, driver_name, udc); 2822 if (status != 0) { 2823 ERR( "can't get irq %ld, err %d\n", 2824 pdev->resource[1].start, status); ··· 2827 2828 /* USB "non-iso" IRQ (PIO for all but ep0) */ 2829 status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, 2830 - SA_SAMPLE_RANDOM, "omap_udc pio", udc); 2831 if (status != 0) { 2832 ERR( "can't get irq %ld, err %d\n", 2833 pdev->resource[2].start, status); ··· 2835 } 2836 #ifdef USE_ISO 2837 status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, 2838 - SA_INTERRUPT, "omap_udc iso", udc); 2839 if (status != 0) { 2840 ERR("can't get irq %ld, err %d\n", 2841 pdev->resource[3].start, status);
··· 2818 2819 /* USB general purpose IRQ: ep0, state changes, dma, etc */ 2820 status = request_irq(pdev->resource[1].start, omap_udc_irq, 2821 + IRQF_SAMPLE_RANDOM, driver_name, udc); 2822 if (status != 0) { 2823 ERR( "can't get irq %ld, err %d\n", 2824 pdev->resource[1].start, status); ··· 2827 2828 /* USB "non-iso" IRQ (PIO for all but ep0) */ 2829 status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, 2830 + IRQF_SAMPLE_RANDOM, "omap_udc pio", udc); 2831 if (status != 0) { 2832 ERR( "can't get irq %ld, err %d\n", 2833 pdev->resource[2].start, status); ··· 2835 } 2836 #ifdef USE_ISO 2837 status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, 2838 + IRQF_DISABLED, "omap_udc iso", udc); 2839 if (status != 0) { 2840 ERR("can't get irq %ld, err %d\n", 2841 pdev->resource[3].start, status);
+3 -3
drivers/usb/gadget/pxa2xx_udc.c
··· 2521 2522 /* irq setup after old hardware state is cleaned up */ 2523 retval = request_irq(IRQ_USB, pxa2xx_udc_irq, 2524 - SA_INTERRUPT, driver_name, dev); 2525 if (retval != 0) { 2526 printk(KERN_ERR "%s: can't get irq %i, err %d\n", 2527 driver_name, IRQ_USB, retval); ··· 2533 if (machine_is_lubbock()) { 2534 retval = request_irq(LUBBOCK_USB_DISC_IRQ, 2535 lubbock_vbus_irq, 2536 - SA_INTERRUPT | SA_SAMPLE_RANDOM, 2537 driver_name, dev); 2538 if (retval != 0) { 2539 printk(KERN_ERR "%s: can't get irq %i, err %d\n", ··· 2544 } 2545 retval = request_irq(LUBBOCK_USB_IRQ, 2546 lubbock_vbus_irq, 2547 - SA_INTERRUPT | SA_SAMPLE_RANDOM, 2548 driver_name, dev); 2549 if (retval != 0) { 2550 printk(KERN_ERR "%s: can't get irq %i, err %d\n",
··· 2521 2522 /* irq setup after old hardware state is cleaned up */ 2523 retval = request_irq(IRQ_USB, pxa2xx_udc_irq, 2524 + IRQF_DISABLED, driver_name, dev); 2525 if (retval != 0) { 2526 printk(KERN_ERR "%s: can't get irq %i, err %d\n", 2527 driver_name, IRQ_USB, retval); ··· 2533 if (machine_is_lubbock()) { 2534 retval = request_irq(LUBBOCK_USB_DISC_IRQ, 2535 lubbock_vbus_irq, 2536 + IRQF_DISABLED | IRQF_SAMPLE_RANDOM, 2537 driver_name, dev); 2538 if (retval != 0) { 2539 printk(KERN_ERR "%s: can't get irq %i, err %d\n", ··· 2544 } 2545 retval = request_irq(LUBBOCK_USB_IRQ, 2546 lubbock_vbus_irq, 2547 + IRQF_DISABLED | IRQF_SAMPLE_RANDOM, 2548 driver_name, dev); 2549 if (retval != 0) { 2550 printk(KERN_ERR "%s: can't get irq %i, err %d\n",
+1 -1
drivers/usb/host/ehci-au1xxx.c
··· 148 /* ehci_hcd_init(hcd_to_ehci(hcd)); */ 149 150 retval = 151 - usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT | SA_SHIRQ); 152 if (retval == 0) 153 return retval; 154
··· 148 /* ehci_hcd_init(hcd_to_ehci(hcd)); */ 149 150 retval = 151 + usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED); 152 if (retval == 0) 153 return retval; 154
+1 -1
drivers/usb/host/ehci-fsl.c
··· 121 temp = in_le32(hcd->regs + 0x1a8); 122 out_le32(hcd->regs + 0x1a8, temp | 0x3); 123 124 - retval = usb_add_hcd(hcd, irq, SA_SHIRQ); 125 if (retval != 0) 126 goto err4; 127 return retval;
··· 121 temp = in_le32(hcd->regs + 0x1a8); 122 out_le32(hcd->regs + 0x1a8, temp | 0x3); 123 124 + retval = usb_add_hcd(hcd, irq, IRQF_SHARED); 125 if (retval != 0) 126 goto err4; 127 return retval;
+1 -1
drivers/usb/host/isp116x-hcd.c
··· 1653 goto err6; 1654 } 1655 1656 - ret = usb_add_hcd(hcd, irq, SA_INTERRUPT); 1657 if (ret) 1658 goto err6; 1659
··· 1653 goto err6; 1654 } 1655 1656 + ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); 1657 if (ret) 1658 goto err6; 1659
+1 -1
drivers/usb/host/ohci-at91.c
··· 125 at91_start_hc(pdev); 126 ohci_hcd_init(hcd_to_ohci(hcd)); 127 128 - retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); 129 if (retval == 0) 130 return retval; 131
··· 125 at91_start_hc(pdev); 126 ohci_hcd_init(hcd_to_ohci(hcd)); 127 128 + retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED); 129 if (retval == 0) 130 return retval; 131
+1 -1
drivers/usb/host/ohci-au1xxx.c
··· 191 au1xxx_start_ohc(dev); 192 ohci_hcd_init(hcd_to_ohci(hcd)); 193 194 - retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT | SA_SHIRQ); 195 if (retval == 0) 196 return retval; 197
··· 191 au1xxx_start_ohc(dev); 192 ohci_hcd_init(hcd_to_ohci(hcd)); 193 194 + retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED); 195 if (retval == 0) 196 return retval; 197
+1 -1
drivers/usb/host/ohci-lh7a404.c
··· 100 lh7a404_start_hc(dev); 101 ohci_hcd_init(hcd_to_ohci(hcd)); 102 103 - retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT); 104 if (retval == 0) 105 return retval; 106
··· 100 lh7a404_start_hc(dev); 101 ohci_hcd_init(hcd_to_ohci(hcd)); 102 103 + retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); 104 if (retval == 0) 105 return retval; 106
+2 -2
drivers/usb/host/ohci-omap.c
··· 14 * This file is licenced under the GPL. 15 */ 16 17 - #include <linux/signal.h> /* SA_INTERRUPT */ 18 #include <linux/jiffies.h> 19 #include <linux/platform_device.h> 20 #include <linux/clk.h> ··· 334 retval = -ENXIO; 335 goto err2; 336 } 337 - retval = usb_add_hcd(hcd, irq, SA_INTERRUPT); 338 if (retval == 0) 339 return retval; 340
··· 14 * This file is licenced under the GPL. 15 */ 16 17 + #include <linux/signal.h> /* IRQF_DISABLED */ 18 #include <linux/jiffies.h> 19 #include <linux/platform_device.h> 20 #include <linux/clk.h> ··· 334 retval = -ENXIO; 335 goto err2; 336 } 337 + retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); 338 if (retval == 0) 339 return retval; 340
+1 -1
drivers/usb/host/ohci-ppc-soc.c
··· 75 ohci->flags |= OHCI_BIG_ENDIAN; 76 ohci_hcd_init(ohci); 77 78 - retval = usb_add_hcd(hcd, irq, SA_INTERRUPT); 79 if (retval == 0) 80 return retval; 81
··· 75 ohci->flags |= OHCI_BIG_ENDIAN; 76 ohci_hcd_init(ohci); 77 78 + retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); 79 if (retval == 0) 80 return retval; 81
+1 -1
drivers/usb/host/ohci-pxa27x.c
··· 190 191 ohci_hcd_init(hcd_to_ohci(hcd)); 192 193 - retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); 194 if (retval == 0) 195 return retval; 196
··· 190 191 ohci_hcd_init(hcd_to_ohci(hcd)); 192 193 + retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED); 194 if (retval == 0) 195 return retval; 196
+1 -1
drivers/usb/host/ohci-s3c2410.c
··· 388 389 ohci_hcd_init(hcd_to_ohci(hcd)); 390 391 - retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT); 392 if (retval != 0) 393 goto err_ioremap; 394
··· 388 389 ohci_hcd_init(hcd_to_ohci(hcd)); 390 391 + retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); 392 if (retval != 0) 393 goto err_ioremap; 394
+1 -1
drivers/usb/host/ohci-sa1111.c
··· 143 sa1111_start_hc(dev); 144 ohci_hcd_init(hcd_to_ohci(hcd)); 145 146 - retval = usb_add_hcd(hcd, dev->irq[1], SA_INTERRUPT); 147 if (retval == 0) 148 return retval; 149
··· 143 sa1111_start_hc(dev); 144 ohci_hcd_init(hcd_to_ohci(hcd)); 145 146 + retval = usb_add_hcd(hcd, dev->irq[1], IRQF_DISABLED); 147 if (retval == 0) 148 return retval; 149
+1 -1
drivers/usb/host/sl811-hcd.c
··· 1749 * was on a system with single edge triggering, so most sorts of 1750 * triggering arrangement should work. 1751 */ 1752 - retval = usb_add_hcd(hcd, irq, SA_INTERRUPT | SA_SHIRQ); 1753 if (retval != 0) 1754 goto err6; 1755
··· 1749 * was on a system with single edge triggering, so most sorts of 1750 * triggering arrangement should work. 1751 */ 1752 + retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); 1753 if (retval != 0) 1754 goto err6; 1755