sparc: Convert to new irq function names (394d441b) · Commits · 戴 / test

arch/sparc/kernel/irq_64.c

+10 −14

Original line number	Diff line number	Diff line
		@@ -526,7 +526,7 @@ void irq_install_pre_handler(int irq,
		void (func)(unsigned int, void , void *),
		void arg1, void arg2)
		{
		struct irq_handler_data *handler_data = get_irq_data(irq);
		struct irq_handler_data *handler_data = irq_get_handler_data(irq);

		handler_data->pre_handler = func;
		handler_data->arg1 = arg1;
		@@ -550,13 +550,11 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)
		if (!irq) {
		irq = irq_alloc(0, ino);
		bucket_set_irq(__pa(bucket), irq);
		set_irq_chip_and_handler_name(irq,
		&sun4u_irq,
		handle_fasteoi_irq,
		"IVEC");
		irq_set_chip_and_handler_name(irq, &sun4u_irq,
		handle_fasteoi_irq, "IVEC");
		}

		handler_data = get_irq_data(irq);
		handler_data = irq_get_handler_data(irq);
		if (unlikely(handler_data))
		goto out;

		@@ -565,7 +563,7 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)
		prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n");
		prom_halt();
		}
		set_irq_data(irq, handler_data);
		irq_set_handler_data(irq, handler_data);

		handler_data->imap = imap;
		handler_data->iclr = iclr;
		@@ -588,12 +586,11 @@ static unsigned int sun4v_build_common(unsigned long sysino,
		if (!irq) {
		irq = irq_alloc(0, sysino);
		bucket_set_irq(__pa(bucket), irq);
		set_irq_chip_and_handler_name(irq, chip,
		handle_fasteoi_irq,
		irq_set_chip_and_handler_name(irq, chip, handle_fasteoi_irq,
		"IVEC");
		}

		handler_data = get_irq_data(irq);
		handler_data = irq_get_handler_data(irq);
		if (unlikely(handler_data))
		goto out;

		@@ -602,7 +599,7 @@ static unsigned int sun4v_build_common(unsigned long sysino,
		prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n");
		prom_halt();
		}
		set_irq_data(irq, handler_data);
		irq_set_handler_data(irq, handler_data);

		/* Catch accidental accesses to these things. IMAP/ICLR handling
		* is done by hypervisor calls on sun4v platforms, not by direct
		@@ -647,8 +644,7 @@ unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino)
		irq = irq_alloc(devhandle, devino);
		bucket_set_irq(__pa(bucket), irq);

		set_irq_chip_and_handler_name(irq, &sun4v_virq,
		handle_fasteoi_irq,
		irq_set_chip_and_handler_name(irq, &sun4v_virq, handle_fasteoi_irq,
		"IVEC");

		handler_data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC);
		@@ -660,7 +656,7 @@ unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino)
		* the interrupt.
		*/
		irq_set_status_flags(irq, IRQ_NOAUTOEN);
		set_irq_data(irq, handler_data);
		irq_set_handler_data(irq, handler_data);

		/* Catch accidental accesses to these things. IMAP/ICLR handling
		* is done by hypervisor calls on sun4v platforms, not by direct

arch/sparc/kernel/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1012,7 +1012,7 @@ int arch_setup_msi_irq(struct pci_dev pdev, struct msi_desc desc)

		void arch_teardown_msi_irq(unsigned int irq)
		{
		struct msi_desc *entry = get_irq_msi(irq);
		struct msi_desc *entry = irq_get_msi_desc(irq);
		struct pci_dev *pdev = entry->dev;
		struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;

arch/sparc/kernel/pci_msi.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -133,8 +133,8 @@ static int sparc64_setup_msi_irq(unsigned int *irq_p,
		if (!*irq_p)
		goto out_err;

		set_irq_chip_and_handler_name(*irq_p, &msi_irq,
		handle_simple_irq, "MSI");
		irq_set_chip_and_handler_name(*irq_p, &msi_irq, handle_simple_irq,
		"MSI");

		err = alloc_msi(pbm);
		if (unlikely(err < 0))
		@@ -160,7 +160,7 @@ static int sparc64_setup_msi_irq(unsigned int *irq_p,
		}
		msg.data = msi;

		set_irq_msi(*irq_p, entry);
		irq_set_msi_desc(*irq_p, entry);
		write_msi_msg(*irq_p, &msg);

		return 0;
		@@ -169,7 +169,7 @@ out_msi_free:
		free_msi(pbm, msi);

		out_irq_free:
		set_irq_chip(*irq_p, NULL);
		irq_set_chip(*irq_p, NULL);
		irq_free(*irq_p);
		*irq_p = 0;

		@@ -208,7 +208,7 @@ static void sparc64_teardown_msi_irq(unsigned int irq,

		free_msi(pbm, msi_num);

		set_irq_chip(irq, NULL);
		irq_set_chip(irq, NULL);
		irq_free(irq);
		}

Admin message