1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 29ad27346443..b3bfce953838 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -516,9 +516,9 @@ static acpi_handle ec_handle;
 
 #define TPACPI_HANDLE(object, parent, paths...)                 \
         static acpi_handle  object##_handle;                    \
-        static acpi_handle *object##_parent = &parent##_handle; \
-        static char        *object##_path;                      \
-        static char        *object##_paths[] = { paths }
+        static const acpi_handle *object##_parent __initdata =  \
+                                                &parent##_handle; \
+        static char *object##_paths[] __initdata = { paths }
 
 TPACPI_HANDLE(ecrd, ec, "ECRD");        /* 570 */
 TPACPI_HANDLE(ecwr, ec, "ECWR");        /* 570 */
@@ -673,11 +673,11 @@ static int issue_thinkpad_cmos_command(int cmos_cmd)
 
 #define TPACPI_ACPIHANDLE_INIT(object) \
         drv_acpi_handle_init(#object, &object##_handle, *object##_parent, \
-                object##_paths, ARRAY_SIZE(object##_paths), &object##_path)
+                object##_paths, ARRAY_SIZE(object##_paths))
 
-static void drv_acpi_handle_init(char *name,
-                           acpi_handle *handle, acpi_handle parent,
-                           char **paths, int num_paths, char **path)
+static void __init drv_acpi_handle_init(const char *name,
+                           acpi_handle *handle, const acpi_handle parent,
+                           char **paths, const int num_paths)
 {
         int i;
         acpi_status status;
@@ -688,10 +688,9 @@ static void drv_acpi_handle_init(char *name,
         for (i = 0; i < num_paths; i++) {
                 status = acpi_get_handle(parent, paths[i], handle);
                 if (ACPI_SUCCESS(status)) {
-                        *path = paths[i];
                         dbg_printk(TPACPI_DBG_INIT,
                                    "Found ACPI handle %s for %s\n",
-                                   *path, name);
+                                   paths[i], name);
                         return;
                 }
         }