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

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

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



Use the new IRQF_ constants and remove the SA_INTERRUPT define

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: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b0b9fdc1

arch/mips/au1000/common/dbdma.c

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static void au1xxx_dbdma_init(void) 
	#error Unknown Au1x00 SOC

#endif



	if (request_irq(irq_nr, dbdma_interrupt, SA_INTERRUPT,

	if (request_irq(irq_nr, dbdma_interrupt, IRQF_DISABLED,

			"Au1xxx dbdma", (void *)dbdma_gptr))

		printk("Can't get 1550 dbdma irq");

}

arch/mips/au1000/common/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ void startup_match20_interrupt(irqreturn_t (*handler)(int, void *, struct pt_reg 
	 * can avoid it.  --cgray

	*/

	action.dev_id = handler;

	action.flags = SA_INTERRUPT;

	action.flags = IRQF_DISABLED;

	cpus_clear(action.mask);

	action.name = "Au1xxx TOY";

	action.handler = handler;

arch/mips/au1000/common/usbdev.c

+4 −4
Original line number Diff line number Diff line
@@ -1465,14 +1465,14 @@ usbdev_init(struct usb_device_descriptor* dev_desc, 
	 */



	/* request the USB device transfer complete interrupt */

	if (request_irq(AU1000_USB_DEV_REQ_INT, req_sus_intr, SA_INTERRUPT,

	if (request_irq(AU1000_USB_DEV_REQ_INT, req_sus_intr, IRQF_DISABLED,

			"USBdev req", &usbdev)) {

		err("Can't get device request intr");

		ret = -ENXIO;

		goto out;

	}

	/* request the USB device suspend interrupt */

	if (request_irq(AU1000_USB_DEV_SUS_INT, req_sus_intr, SA_INTERRUPT,

	if (request_irq(AU1000_USB_DEV_SUS_INT, req_sus_intr, IRQF_DISABLED,

			"USBdev sus", &usbdev)) {

		err("Can't get device suspend intr");

		ret = -ENXIO;
@@ -1483,7 +1483,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc, 
	if ((ep0->indma = request_au1000_dma(ep_dma_id[0].id,

					     ep_dma_id[0].str,

					     dma_done_ep0_intr,

					     SA_INTERRUPT,

					     IRQF_DISABLED,

					     &usbdev)) < 0) {

		err("Can't get %s DMA", ep_dma_id[0].str);

		ret = -ENXIO;
@@ -1516,7 +1516,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc, 
				request_au1000_dma(ep_dma_id[ep->address].id,

						   ep_dma_id[ep->address].str,

						   dma_done_ep_intr,

						   SA_INTERRUPT,

						   IRQF_DISABLED,

						   &usbdev);

			if (ep->indma < 0) {

				err("Can't get %s DMA",

arch/mips/basler/excite/excite_iodev.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int __exit iodev_remove(struct device *dev) 


static int iodev_open(struct inode *i, struct file *f)

{

	return request_irq(iodev_irq, iodev_irqhdl, SA_INTERRUPT,

	return request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,

			   iodev_name, &miscdev);

}

arch/mips/dec/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static struct irqaction fpuirq = { 
};



static struct irqaction busirq = {

	.flags = SA_INTERRUPT,

	.flags = IRQF_DISABLED,

	.name = "bus error",

};
@@ -124,7 +124,7 @@ static void __init dec_be_init(void) 
	case MACH_DS23100:	/* DS2100/DS3100 Pmin/Pmax */

		board_be_handler = dec_kn01_be_handler;

		busirq.handler = dec_kn01_be_interrupt;

		busirq.flags |= SA_SHIRQ;

		busirq.flags |= IRQF_SHARED;

		dec_kn01_be_init();

		break;

	case MACH_DS5000_1XX:	/* DS5000/1xx 3min */