lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc: Convert to new irq function names

Browse Source 
Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: sparclinux@vger.kernel.org
This commit is contained in:
Thomas Gleixner
2011-03-24 17:52:54 +01:00
parent 16741ea041
commit 394d441b91
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/sparc/kernel/irq_64.c
View File

@@ -526,7 +526,7 @@ void irq_install_pre_handler(int irq,
void (*func)(unsigned int, void *, void *), void (*func)(unsigned int, void *, void *),
void *arg1, void *arg2) 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->pre_handler = func;
handler_data->arg1 = arg1; handler_data->arg1 = arg1;
@@ -550,13 +550,11 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)
if (!irq) { if (!irq) {
irq = irq_alloc(0, ino); irq = irq_alloc(0, ino);
bucket_set_irq(__pa(bucket), irq); bucket_set_irq(__pa(bucket), irq);
set_irq_chip_and_handler_name(irq, irq_set_chip_and_handler_name(irq, &sun4u_irq,
&sun4u_irq, handle_fasteoi_irq, "IVEC");
handle_fasteoi_irq,
"IVEC");
} }
handler_data = get_irq_data(irq); handler_data = irq_get_handler_data(irq);
if (unlikely(handler_data)) if (unlikely(handler_data))
goto out; 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_printf("IRQ: kzalloc(irq_handler_data) failed.\n");
prom_halt(); prom_halt();
} }
set_irq_data(irq, handler_data); irq_set_handler_data(irq, handler_data);
handler_data->imap = imap; handler_data->imap = imap;
handler_data->iclr = iclr; handler_data->iclr = iclr;
@@ -588,12 +586,11 @@ static unsigned int sun4v_build_common(unsigned long sysino,
if (!irq) { if (!irq) {
irq = irq_alloc(0, sysino); irq = irq_alloc(0, sysino);
bucket_set_irq(__pa(bucket), irq); bucket_set_irq(__pa(bucket), irq);
set_irq_chip_and_handler_name(irq, chip, irq_set_chip_and_handler_name(irq, chip, handle_fasteoi_irq,
handle_fasteoi_irq,
"IVEC"); "IVEC");
} }
handler_data = get_irq_data(irq); handler_data = irq_get_handler_data(irq);
if (unlikely(handler_data)) if (unlikely(handler_data))
goto out; 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_printf("IRQ: kzalloc(irq_handler_data) failed.\n");
prom_halt(); prom_halt();
} }
set_irq_data(irq, handler_data); irq_set_handler_data(irq, handler_data);
/* Catch accidental accesses to these things. IMAP/ICLR handling /* Catch accidental accesses to these things. IMAP/ICLR handling
* is done by hypervisor calls on sun4v platforms, not by direct * 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); irq = irq_alloc(devhandle, devino);
bucket_set_irq(__pa(bucket), irq); bucket_set_irq(__pa(bucket), irq);
set_irq_chip_and_handler_name(irq, &sun4v_virq, irq_set_chip_and_handler_name(irq, &sun4v_virq, handle_fasteoi_irq,
handle_fasteoi_irq,
"IVEC"); "IVEC");
handler_data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC); 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. * the interrupt.
*/ */
irq_set_status_flags(irq, IRQ_NOAUTOEN); 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 /* Catch accidental accesses to these things. IMAP/ICLR handling
* is done by hypervisor calls on sun4v platforms, not by direct * is done by hypervisor calls on sun4v platforms, not by direct

2
arch/sparc/kernel/pci.c
View File

@@ -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) 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_dev *pdev = entry->dev;
struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;

10
arch/sparc/kernel/pci_msi.c
View File

@@ -133,8 +133,8 @@ static int sparc64_setup_msi_irq(unsigned int *irq_p,
if (!*irq_p) if (!*irq_p)
goto out_err; goto out_err;
set_irq_chip_and_handler_name(*irq_p, &msi_irq, irq_set_chip_and_handler_name(*irq_p, &msi_irq, handle_simple_irq,
handle_simple_irq, "MSI"); "MSI");
err = alloc_msi(pbm); err = alloc_msi(pbm);
if (unlikely(err < 0)) if (unlikely(err < 0))
@@ -160,7 +160,7 @@ static int sparc64_setup_msi_irq(unsigned int *irq_p,
} }
msg.data = msi; msg.data = msi;
set_irq_msi(*irq_p, entry); irq_set_msi_desc(*irq_p, entry);
write_msi_msg(*irq_p, &msg); write_msi_msg(*irq_p, &msg);
return 0; return 0;
@@ -169,7 +169,7 @@ out_msi_free:
free_msi(pbm, msi); free_msi(pbm, msi);
out_irq_free: out_irq_free:
set_irq_chip(*irq_p, NULL); irq_set_chip(*irq_p, NULL);
irq_free(*irq_p); irq_free(*irq_p);
*irq_p = 0; *irq_p = 0;
@@ -208,7 +208,7 @@ static void sparc64_teardown_msi_irq(unsigned int irq,
free_msi(pbm, msi_num); free_msi(pbm, msi_num);
set_irq_chip(irq, NULL); irq_set_chip(irq, NULL);
irq_free(irq); irq_free(irq);
} }