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

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

[PATCH] irq-flags: SPARC64: 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>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6d20819f

arch/sparc64/kernel/ebus.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ int ebus_dma_irq_enable(struct ebus_dma_info *p, int on) 




	if (on) {

	if (on) {

		if (p->flags & EBUS_DMA_FLAG_USE_EBDMA_HANDLER) {

		if (p->flags & EBUS_DMA_FLAG_USE_EBDMA_HANDLER) {

			if (request_irq(p->irq, ebus_dma_irq, SA_SHIRQ, p->name, p))

			if (request_irq(p->irq, ebus_dma_irq, IRQF_SHARED, p->name, p))

				return -EBUSY;

				return -EBUSY;

		}

		}

arch/sparc64/kernel/pci_psycho.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -863,11 +863,11 @@ static void psycho_register_error_handlers(struct pci_controller_info *p) 
	if (op->num_irqs < 6)

	if (op->num_irqs < 6)

		return;

		return;





	request_irq(op->irqs[1], psycho_ue_intr, SA_SHIRQ, "PSYCHO UE", p);

	request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED, "PSYCHO UE", p);

	request_irq(op->irqs[2], psycho_ce_intr, SA_SHIRQ, "PSYCHO CE", p);

	request_irq(op->irqs[2], psycho_ce_intr, IRQF_SHARED, "PSYCHO CE", p);

	request_irq(op->irqs[5], psycho_pcierr_intr, SA_SHIRQ,

	request_irq(op->irqs[5], psycho_pcierr_intr, IRQF_SHARED,

		    "PSYCHO PCIERR-A", &p->pbm_A);

		    "PSYCHO PCIERR-A", &p->pbm_A);

	request_irq(op->irqs[0], psycho_pcierr_intr, SA_SHIRQ,

	request_irq(op->irqs[0], psycho_pcierr_intr, IRQF_SHARED,

		    "PSYCHO PCIERR-B", &p->pbm_B);

		    "PSYCHO PCIERR-B", &p->pbm_B);





	/* Enable UE and CE interrupts for controller. */

	/* Enable UE and CE interrupts for controller. */

arch/sparc64/kernel/pci_sabre.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -854,14 +854,14 @@ static void sabre_register_error_handlers(struct pci_controller_info *p) 
		     SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |

		     SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |

		     SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE));

		     SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE));





	request_irq(op->irqs[1], sabre_ue_intr, SA_SHIRQ, "SABRE UE", p);

	request_irq(op->irqs[1], sabre_ue_intr, IRQF_SHARED, "SABRE UE", p);





	sabre_write(base + SABRE_CE_AFSR,

	sabre_write(base + SABRE_CE_AFSR,

		    (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |

		    (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |

		     SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR));

		     SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR));





	request_irq(op->irqs[2], sabre_ce_intr, SA_SHIRQ, "SABRE CE", p);

	request_irq(op->irqs[2], sabre_ce_intr, IRQF_SHARED, "SABRE CE", p);

	request_irq(op->irqs[0], sabre_pcierr_intr, SA_SHIRQ,

	request_irq(op->irqs[0], sabre_pcierr_intr, IRQF_SHARED,

		    "SABRE PCIERR", p);

		    "SABRE PCIERR", p);





	tmp = sabre_read(base + SABRE_PCICTRL);

	tmp = sabre_read(base + SABRE_PCICTRL);

arch/sparc64/kernel/pci_schizo.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -998,32 +998,32 @@ static void tomatillo_register_error_handlers(struct pci_controller_info *p) 
	pbm = pbm_for_ino(p, SCHIZO_UE_INO);

	pbm = pbm_for_ino(p, SCHIZO_UE_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ,

		request_irq(op->irqs[1], schizo_ue_intr, IRQF_SHARED,

			    "TOMATILLO_UE", p);

			    "TOMATILLO_UE", p);





	pbm = pbm_for_ino(p, SCHIZO_CE_INO);

	pbm = pbm_for_ino(p, SCHIZO_CE_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ,

		request_irq(op->irqs[2], schizo_ce_intr, IRQF_SHARED,

			    "TOMATILLO CE", p);

			    "TOMATILLO CE", p);





	pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);

	pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,

		request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,

			    "TOMATILLO PCIERR-A", pbm);

			    "TOMATILLO PCIERR-A", pbm);









	pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);

	pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,

		request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,

			    "TOMATILLO PCIERR-B", pbm);

			    "TOMATILLO PCIERR-B", pbm);





	pbm = pbm_for_ino(p, SCHIZO_SERR_INO);

	pbm = pbm_for_ino(p, SCHIZO_SERR_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ,

		request_irq(op->irqs[3], schizo_safarierr_intr, IRQF_SHARED,

			    "TOMATILLO SERR", p);

			    "TOMATILLO SERR", p);





	/* Enable UE and CE interrupts for controller. */

	/* Enable UE and CE interrupts for controller. */
@@ -1106,32 +1106,32 @@ static void schizo_register_error_handlers(struct pci_controller_info *p) 
	pbm = pbm_for_ino(p, SCHIZO_UE_INO);

	pbm = pbm_for_ino(p, SCHIZO_UE_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ,

		request_irq(op->irqs[1], schizo_ue_intr, IRQF_SHARED,

			    "SCHIZO_UE", p);

			    "SCHIZO_UE", p);





	pbm = pbm_for_ino(p, SCHIZO_CE_INO);

	pbm = pbm_for_ino(p, SCHIZO_CE_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ,

		request_irq(op->irqs[2], schizo_ce_intr, IRQF_SHARED,

			    "SCHIZO CE", p);

			    "SCHIZO CE", p);





	pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);

	pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,

		request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,

			    "SCHIZO PCIERR-A", pbm);

			    "SCHIZO PCIERR-A", pbm);









	pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);

	pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,

		request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,

			    "SCHIZO PCIERR-B", pbm);

			    "SCHIZO PCIERR-B", pbm);





	pbm = pbm_for_ino(p, SCHIZO_SERR_INO);

	pbm = pbm_for_ino(p, SCHIZO_SERR_INO);

	op = of_find_device_by_node(pbm->prom_node);

	op = of_find_device_by_node(pbm->prom_node);

	if (op)

	if (op)

		request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ,

		request_irq(op->irqs[3], schizo_safarierr_intr, IRQF_SHARED,

			    "SCHIZO SERR", p);

			    "SCHIZO SERR", p);





	/* Enable UE and CE interrupts for controller. */

	/* Enable UE and CE interrupts for controller. */

arch/sparc64/kernel/sbus.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1065,7 +1065,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus) 




	irq = sbus_build_irq(sbus, SYSIO_UE_INO);

	irq = sbus_build_irq(sbus, SYSIO_UE_INO);

	if (request_irq(irq, sysio_ue_handler,

	if (request_irq(irq, sysio_ue_handler,

			SA_SHIRQ, "SYSIO UE", sbus) < 0) {

			IRQF_SHARED, "SYSIO UE", sbus) < 0) {

		prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",

		prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",

			    sbus->portid);

			    sbus->portid);

		prom_halt();

		prom_halt();
@@ -1073,7 +1073,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus) 




	irq = sbus_build_irq(sbus, SYSIO_CE_INO);

	irq = sbus_build_irq(sbus, SYSIO_CE_INO);

	if (request_irq(irq, sysio_ce_handler,

	if (request_irq(irq, sysio_ce_handler,

			SA_SHIRQ, "SYSIO CE", sbus) < 0) {

			IRQF_SHARED, "SYSIO CE", sbus) < 0) {

		prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",

		prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",

			    sbus->portid);

			    sbus->portid);

		prom_halt();

		prom_halt();
@@ -1081,7 +1081,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus) 




	irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);

	irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);

	if (request_irq(irq, sysio_sbus_error_handler,

	if (request_irq(irq, sysio_sbus_error_handler,

			SA_SHIRQ, "SYSIO SBUS Error", sbus) < 0) {

			IRQF_SHARED, "SYSIO SBUS Error", sbus) < 0) {

		prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",

		prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",

			    sbus->portid);

			    sbus->portid);

		prom_halt();

		prom_halt();