Commit 152cc397 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Greg Kroah-Hartman
Browse files

Staging: meilhaus: Remove long-deprecated SA_* interrupt macros. 



Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dd968642

drivers/staging/meilhaus/me0600_ext_irq.c

+0 −4
Original line number Diff line number Diff line
@@ -434,11 +434,7 @@ me0600_ext_irq_subdevice_t *me0600_ext_irq_constructor(uint32_t plx_reg_base, 
	subdevice->irq = irq;



	err = request_irq(subdevice->irq, me0600_isr,

#ifdef IRQF_DISABLED

			  IRQF_DISABLED | IRQF_SHARED,

#else

			  SA_INTERRUPT | SA_SHIRQ,

#endif

			  ME0600_NAME, (void *)subdevice);



	if (err) {

drivers/staging/meilhaus/me1400_ext_irq.c

+0 −4
Original line number Diff line number Diff line
@@ -458,11 +458,7 @@ me1400_ext_irq_subdevice_t *me1400_ext_irq_constructor(uint32_t device_id, 
	subdevice->irq = irq;



	err = request_irq(irq, me1400_ext_irq_isr,

#ifdef IRQF_DISABLED

			  IRQF_DISABLED | IRQF_SHARED,

#else

			  SA_INTERRUPT | SA_SHIRQ,

#endif

			  ME1400_NAME, (void *)subdevice);



	if (err) {

drivers/staging/meilhaus/me4600_ai.c

+0 −4
Original line number Diff line number Diff line
@@ -299,11 +299,7 @@ me4600_ai_subdevice_t *me4600_ai_constructor(uint32_t reg_base, 
	// Register interrupt service routine.

	subdevice->irq = irq;

	if (request_irq(subdevice->irq, me4600_ai_isr,

#ifdef IRQF_DISABLED

			IRQF_DISABLED | IRQF_SHARED,

#else

			SA_INTERRUPT | SA_SHIRQ,

#endif

			ME4600_NAME, subdevice)) {

		PERROR("Cannot register interrupt service routine.\n");

		me_subdevice_deinit((me_subdevice_t *) subdevice);

drivers/staging/meilhaus/me4600_ao.c

+1 −5
Original line number Diff line number Diff line
@@ -2567,11 +2567,7 @@ me4600_ao_subdevice_t *me4600_ao_constructor(uint32_t reg_base, 
	if (subdevice->fifo) {

		subdevice->irq = irq;

		if (request_irq(subdevice->irq, me4600_ao_isr,

#ifdef IRQF_DISABLED

				IRQF_DISABLED | IRQF_SHARED,

#else

				SA_INTERRUPT | SA_SHIRQ,

#endif

				ME4600_NAME, subdevice)) {

			PERROR("Cannot get interrupt line.\n");

			PDEBUG("free circ_buf = %p size=%d",
@@ -5737,7 +5733,7 @@ me4600_ao_subdevice_t *me4600_ao_constructor(uint32_t reg_base, 
	subdevice->irq = irq;



	if (request_irq

	    (subdevice->irq, me4600_ao_isr, SA_INTERRUPT | SA_SHIRQ,

	    (subdevice->irq, me4600_ao_isr, IRQF_DISABLED | IRQF_SHARED,

	     ME4600_NAME, subdevice)) {

		PERROR("Cannot get interrupt line.\n");

		me_subdevice_deinit((me_subdevice_t *) subdevice);

drivers/staging/meilhaus/me4600_ext_irq.c

+0 −4
Original line number Diff line number Diff line
@@ -420,11 +420,7 @@ me4600_ext_irq_subdevice_t *me4600_ext_irq_constructor(uint32_t reg_base, 
	subdevice->irq = irq;



	if (request_irq(subdevice->irq, me4600_ext_irq_isr,

#ifdef IRQF_DISABLED

			IRQF_DISABLED | IRQF_SHARED,

#else

			SA_INTERRUPT | SA_SHIRQ,

#endif

			ME4600_NAME, subdevice)) {

		PERROR("Cannot register interrupt.\n");

		kfree(subdevice);