From: Lv Zheng <lv.zheng@intel.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>
Cc: Lv Zheng <lv.zheng@intel.com>, Lv Zheng <zetalog@gmail.com>,
<linux-kernel@vger.kernel.org>,
linux-acpi@vger.kernel.org
Subject: [PATCH 01/31] ACPICA: Linuxize: Reduce divergences for 20150410 release.
Date: Mon, 13 Apr 2015 11:48:12 +0800 [thread overview]
Message-ID: <1eb832296d0c4e02fcb7369939add33784a63ef0.1428893936.git.lv.zheng@intel.com> (raw)
In-Reply-To: <cover.1428893935.git.lv.zheng@intel.com>
This patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20150410 release can be
applied with reduced human intervention.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
drivers/acpi/acpica/acresrc.h | 2 +-
drivers/acpi/acpica/acutils.h | 2 --
drivers/acpi/acpica/exregion.c | 2 +-
drivers/acpi/acpica/rsdump.c | 2 +-
drivers/acpi/acpica/tbxfroot.c | 2 +-
5 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index efc4c71..959be91 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -303,7 +303,7 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
*/
void acpi_rs_dump_resource_list(struct acpi_resource *resource);
-void acpi_rs_dump_irq_list(u8 * route_table);
+void acpi_rs_dump_irq_list(u8 *route_table);
/*
* Resource conversion tables
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index c2f03e8..3ae0447 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -539,13 +539,11 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
u16 action,
union acpi_generic_state **state_list);
-#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ut_create_pkg_state_and_push(void *internal_object,
void *external_object,
u16 index,
union acpi_generic_state **state_list);
-#endif /* ACPI_FUTURE_USAGE */
union acpi_generic_state *acpi_ut_create_control_state(void);
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 0fe188e2..0ca217e 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -182,7 +182,7 @@ acpi_ex_system_memory_space_handler(u32 function,
ACPI_ERROR((AE_INFO,
"Could not map memory at 0x%8.8X%8.8X, size %u",
ACPI_FORMAT_NATIVE_UINT(address),
- (u32) map_length));
+ (u32)map_length));
mem_info->mapped_length = 0;
return_ACPI_STATUS(AE_NO_MEMORY);
}
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 1539394..8d4f262 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -438,7 +438,7 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
*
******************************************************************************/
-void acpi_rs_dump_irq_list(u8 * route_table)
+void acpi_rs_dump_irq_list(u8 *route_table)
{
struct acpi_pci_routing_table *prt_element;
u8 count;
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index eac52cf..e1416a2 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -142,7 +142,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp * rsdp)
*
******************************************************************************/
-acpi_status __init acpi_find_root_pointer(acpi_size *table_address)
+acpi_status __init acpi_find_root_pointer(acpi_size * table_address)
{
u8 *table_ptr;
u8 *mem_rover;
--
1.7.10
next prev parent reply other threads:[~2015-04-13 3:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 3:48 [PATCH 00/31] ACPICA: 20150410 Release Lv Zheng
2015-04-13 3:48 ` Lv Zheng [this message]
2015-04-13 3:48 ` [PATCH 02/31] ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address Lv Zheng
2015-04-13 3:48 ` [PATCH 03/31] ACPICA: Unix: Cleanup to use ACPI_TO_INTEGER() to calc page offset Lv Zheng
2015-04-13 3:48 ` [PATCH 04/31] ACPICA: Executer: Cleanup to remove an unnecessary conversion Lv Zheng
2015-04-13 3:48 ` [PATCH 05/31] ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR() Lv Zheng
2015-04-13 3:48 ` [PATCH 06/31] ACPICA: Utilities: Cleanup to convert physical address printing formats Lv Zheng
2015-04-13 3:48 ` [PATCH 07/31] ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers Lv Zheng
2015-04-13 3:48 ` [PATCH 08/31] ACPICA: Utilities: split IO address types from data type models Lv Zheng
2015-04-13 3:49 ` [PATCH 09/31] ACPICA: Tables: Don't release ACPI_MTX_TABLES in acpi_tb_install_standard_table() Lv Zheng
2015-04-13 3:49 ` [PATCH 10/31] ACPICA: Events: Add support to return both enable/status register values for GPE and fixed event Lv Zheng
2015-04-13 3:49 ` [PATCH 11/31] ACPICA: Applications: Remove use of __DATE__ macro Lv Zheng
2015-04-13 3:49 ` [PATCH 12/31] ACPICA: Utilities: Remove unused acpi_ut_create_pkg_state_and_push() Lv Zheng
2015-04-13 3:49 ` [PATCH 13/31] ACPICA: Tables: Move an iasl specific table function to iasl source file Lv Zheng
2015-04-13 3:49 ` [PATCH 14/31] ACPICA: Utilities: Correct conditional compilation definitions Lv Zheng
2015-04-13 3:49 ` [PATCH 15/31] ACPICA: Resources: " Lv Zheng
2015-04-13 3:49 ` [PATCH 16/31] ACPICA: Casting changes around acpi_physical_address/acpi_size Lv Zheng
2015-04-13 3:50 ` [PATCH 17/31] ACPICA: Fix a sscanf format string Lv Zheng
2015-04-13 3:50 ` [PATCH 18/31] ACPICA: Update Resource descriptor dump module Lv Zheng
2015-04-13 3:50 ` [PATCH 19/31] ACPICA: Update AML Debugger global variables Lv Zheng
2015-04-13 3:50 ` [PATCH 20/31] ACPICA: iASL/Disassembler: Add option to assume table contains valid AML Lv Zheng
2015-04-13 3:50 ` [PATCH 21/31] ACPICA: iASL: Enhancement for constant folding Lv Zheng
2015-04-13 3:50 ` [PATCH 22/31] ACPICA: Add infrastructure for External() opcode Lv Zheng
2015-04-13 3:50 ` [PATCH 23/31] ACPICA: Add "Windows 2015" string to _OSI support Lv Zheng
2015-04-13 3:50 ` [PATCH 24/31] ACPICA: Permanently set _REV to the value '2' Lv Zheng
2015-04-13 3:50 ` [PATCH 25/31] ACPICA: Remove unused internal AML opcode Lv Zheng
2015-04-13 3:50 ` [PATCH 26/31] ACPICA: Add "//" before ascii output of buffers Lv Zheng
2015-04-13 3:51 ` [PATCH 27/31] ACPICA: Update for SLIC ACPI table Lv Zheng
2015-04-13 3:51 ` [PATCH 28/31] ACPICA: iASL: Add support for MSDM " Lv Zheng
2015-04-13 3:51 ` [PATCH 29/31] ACPICA: Disassembler: Some cleanup of the table dump module Lv Zheng
2015-04-13 3:51 ` [PATCH 30/31] ACPICA: Fix a couple issues with the local printf module Lv Zheng
2015-04-13 3:51 ` [PATCH 31/31] ACPICA: Update version to 20150410 Lv Zheng
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=1eb832296d0c4e02fcb7369939add33784a63ef0.1428893936.git.lv.zheng@intel.com \
--to=lv.zheng@intel.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=zetalog@gmail.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
all inboxes | Powered by JetHome®