From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Feng Tang <feng.tang@intel.com>,
Bob Moore <robert.moore@intel.com>,
Len Brown <len.brown@intel.com>
Subject: [PATCH 08/23] ACPICA: GPE support: Remove extraneous parameter from low-level function.
Date: Sun, 23 Sep 2012 00:33:56 -0400 [thread overview]
Message-ID: <1d94e1e8ba9d466c707f1bcb32494ca7daefb644.1348371388.git.len.brown@intel.com> (raw)
In-Reply-To: <1348374851-20378-1-git-send-email-lenb@kernel.org>
In-Reply-To: <a950c135e5b2be6ef7518d54d98a7901db1b377a.1348371388.git.len.brown@intel.com>
From: Feng Tang <feng.tang@intel.com>
The gpe_register_info argument is no longer needed, reduce it to
make code simpler.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/acpica/achware.h | 3 +--
drivers/acpi/acpica/evgpe.c | 3 +--
drivers/acpi/acpica/evxfgpe.c | 3 +--
drivers/acpi/acpica/hwgpe.c | 15 +++++----------
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 5de4ec7..d902d31 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -110,8 +110,7 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width);
/*
* hwgpe - GPE support
*/
-u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,
- struct acpi_gpe_register_info *gpe_register_info);
+u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info);
acpi_status
acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action);
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 3db3c56..ef0193d 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -80,8 +80,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
return_ACPI_STATUS(AE_NOT_EXIST);
}
- register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
- gpe_register_info);
+ register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
/* Clear the run bit up front */
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 6affbdb..87c5f23 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -357,8 +357,7 @@ acpi_status acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 ac
goto unlock_and_exit;
}
- register_bit =
- acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
+ register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
/* Perform the action */
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 25bd28c..db40765 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -60,7 +60,6 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
* FUNCTION: acpi_hw_get_gpe_register_bit
*
* PARAMETERS: gpe_event_info - Info block for the GPE
- * gpe_register_info - Info block for the GPE register
*
* RETURN: Register mask with a one in the GPE bit position
*
@@ -69,11 +68,10 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
*
******************************************************************************/
-u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,
- struct acpi_gpe_register_info *gpe_register_info)
+u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info)
{
return (u32)1 << (gpe_event_info->gpe_number -
- gpe_register_info->base_gpe_number);
+ gpe_event_info->register_info->base_gpe_number);
}
/******************************************************************************
@@ -115,8 +113,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
/* Set or clear just the bit that corresponds to this GPE */
- register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
- gpe_register_info);
+ register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
switch (action) {
case ACPI_GPE_CONDITIONAL_ENABLE:
@@ -178,8 +175,7 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
* Write a one to the appropriate bit in the status register to
* clear this GPE.
*/
- register_bit =
- acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
+ register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
status = acpi_hw_write(register_bit,
&gpe_register_info->status_address);
@@ -222,8 +218,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
/* Get the register bitmask for this GPE */
- register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
- gpe_register_info);
+ register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
/* GPE currently enabled? (enabled for runtime?) */
--
1.7.12.1.396.g16eed7c
next prev parent reply other threads:[~2012-09-23 4:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-23 4:33 ACPICA related patch queue for Linux-3.7 Len Brown
2012-09-23 4:33 ` [PATCH 01/23] ACPI: delelte more BFS/GTS related definition and code Len Brown
2012-09-23 4:33 ` [PATCH 02/23] ACPICA: Enable Scope change to root during module-level code execution Len Brown
2012-09-23 4:33 ` [PATCH 03/23] ACPICA: Split ACPICA initialization functions to new file, utxfinit.c Len Brown
2012-09-23 4:33 ` [PATCH 04/23] ACPICA: Comment update: Fix some typos in actble.h Len Brown
2012-09-23 4:33 ` [PATCH 05/23] ACPICA: Add Windows8/Server2012 string for _OSI method Len Brown
2012-09-23 4:33 ` [PATCH 06/23] ACPICA: GPE Support: Update debug info for GPE tracing Len Brown
2012-09-23 4:33 ` [PATCH 07/23] ACPICA: Debug output: Update output for Processor object Len Brown
2012-09-23 4:33 ` Len Brown [this message]
2012-09-23 4:33 ` [PATCH 09/23] ACPICA: Headers: Add support for CSRT and DBG2 ACPI tables Len Brown
2012-09-23 4:33 ` [PATCH 10/23] ACPICA: Add support for complex _PLD buffers Len Brown
2012-09-23 4:33 ` [PATCH 11/23] ACPICA: Add struct header support for _FDE, _GRT, _GTM, and _SRT names Len Brown
2012-09-23 4:34 ` [PATCH 12/23] ACPICA: Update version to 20120816 Len Brown
2012-09-23 4:34 ` [PATCH 13/23] ACPI: Use ACPICA native way to decode the PLD buffer Len Brown
2012-09-23 4:34 ` [PATCH 14/23] usb-acpi: Comply with the ACPI API change Len Brown
2012-09-23 5:54 ` Greg Kroah-Hartman
2012-09-23 4:34 ` [PATCH 15/23] ACPICA: Headers: Add new ACPI 5 HEST notify type values Len Brown
2012-09-23 4:34 ` [PATCH 16/23] ACPICA: Table Manager: Merge duplicate code (root table) Len Brown
2012-09-23 4:34 ` [PATCH 17/23] ACPICA: Update version to 20120913 Len Brown
2012-09-23 4:34 ` [PATCH 18/23] tools/power/acpi/acpidump: version 20051111 Len Brown
2012-09-23 4:34 ` [PATCH 19/23] tools/power/acpi/acpidump: version 20060606 Len Brown
2012-09-23 4:34 ` [PATCH 20/23] tools/power/acpi/acpidump: version 20070714 Len Brown
2012-09-23 4:34 ` [PATCH 21/23] tools/power/acpi/acpidump: version 20071116 Len Brown
2012-09-23 4:34 ` [PATCH 22/23] tools/power/acpi/acpidump: version 20101221 - find dynamic tables in sysfs Len Brown
2012-09-23 4:34 ` [PATCH 23/23] tools/power/acpi/acpidump: create acpidump(8), local make install targets Len Brown
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=1d94e1e8ba9d466c707f1bcb32494ca7daefb644.1348371388.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=feng.tang@intel.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robert.moore@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).