From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: acpi-devel@lists.sourceforge.net, linux-ia64@vger.kernel.org
Cc: Andi Kleen <ak@suse.de>, "Nakajima, Jun" <jun.nakajima@intel.com>,
"Brown, Len" <len.brown@intel.com>
Subject: Re: [ACPI] [PATCH] 6 of 6 rename some ACPI IRQ variables
Date: Tue, 09 Mar 2004 23:27:12 +0000 [thread overview]
Message-ID: <200403091627.12824.bjorn.helgaas@hp.com> (raw)
In-Reply-To: <200403091619.04333.bjorn.helgaas@hp.com>
ACPI: Rename ACPI IRQ variables for clarity
acpi_irq_irq -> acpi_irq_global_irq
acpi_irq -> acpi_irq_trampoline
diff -Nru a/drivers/acpi/osl.c b/drivers/acpi/osl.c
--- a/drivers/acpi/osl.c Tue Mar 9 14:44:25 2004
+++ b/drivers/acpi/osl.c Tue Mar 9 14:44:25 2004
@@ -63,7 +63,7 @@
extern char line_buf[80];
#endif /*ENABLE_DEBUGGER*/
-static int acpi_irq_irq;
+static int acpi_irq_global_irq;
static OSD_HANDLER acpi_irq_handler;
static void *acpi_irq_context;
@@ -88,7 +88,7 @@
acpi_os_terminate(void)
{
if (acpi_irq_handler) {
- acpi_os_remove_interrupt_handler(acpi_irq_irq,
+ acpi_os_remove_interrupt_handler(acpi_irq_global_irq,
acpi_irq_handler);
}
@@ -234,7 +234,7 @@
}
static irqreturn_t
-acpi_irq(int irq, void *dev_id, struct pt_regs *regs)
+acpi_irq_trampoline(int irq, void *dev_id, struct pt_regs *regs)
{
return (*acpi_irq_handler)(acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE;
}
@@ -258,11 +258,11 @@
}
acpi_irq_handler = handler;
acpi_irq_context = context;
- if (request_irq(irq, acpi_irq, SA_SHIRQ, "acpi", acpi_irq)) {
+ if (request_irq(irq, acpi_irq_trampoline, SA_SHIRQ, "acpi", acpi_irq_trampoline)) {
printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
return AE_NOT_ACQUIRED;
}
- acpi_irq_irq = global_irq;
+ acpi_irq_global_irq = global_irq;
return AE_OK;
}
@@ -277,9 +277,9 @@
printk(KERN_ERR PREFIX "Can't remove ACPI interrupt handler\n");
return AE_ERROR;
}
- free_irq(irq, acpi_irq);
+ free_irq(irq, acpi_irq_trampoline);
acpi_irq_handler = NULL;
- acpi_irq_irq = 0;
+ acpi_irq_global_irq = 0;
}
return AE_OK;
next prev parent reply other threads:[~2004-03-09 23:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-09 23:19 [PATCH] clean up some ACPI IRQ conversions Bjorn Helgaas
2004-03-09 23:24 ` [ACPI] [PATCH] 1 of 6 sync mpparse Bjorn Helgaas
2004-03-09 23:25 ` [ACPI] [PATCH] 2 of 6 add acpi_irq_to_vector for x86_64 Bjorn Helgaas
[not found] ` <200403091619.04333.bjorn.helgaas-VXdhtT5mjnY@public.gmane.org>
2004-03-09 23:26 ` [ACPI] [PATCH] 3 of 6 use global_irq to refer to ACPI global IRQs Bjorn Helgaas
2004-03-09 23:26 ` [ACPI] [PATCH] 4 of 6 introduce acpi_global_irq_to_irq() Bjorn Helgaas
2004-03-09 23:44 ` David Mosberger
2004-03-10 0:00 ` Nakajima, Jun
2004-03-10 0:09 ` Bjorn Helgaas
2004-03-09 23:26 ` [ACPI] [PATCH] 5 of 6 avoid double conversion of ACPI OS interrupt Bjorn Helgaas
2004-03-09 23:27 ` Bjorn Helgaas [this message]
2004-03-09 23:54 ` [PATCH] clean up some ACPI IRQ conversions Andi Kleen
2004-03-10 16:41 ` Bjorn Helgaas
2004-03-10 17:10 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200403091627.12824.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp.com \
--cc=acpi-devel@lists.sourceforge.net \
--cc=ak@suse.de \
--cc=jun.nakajima@intel.com \
--cc=len.brown@intel.com \
--cc=linux-ia64@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox