Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d54b5caa authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: usb: Use the new IRQF_ constants 



Signed-off-by: default avatarThomas 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40663cc7

drivers/usb/core/hcd-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/usb/gadget/at91_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/usb/gadget/goku_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/usb/gadget/lh7a40x_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/usb/gadget/net2280.c

+1 −1
Original line number Diff line number Diff line
@@ -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;