X86 platform driver: Fix section mismatch in wmi.c

watologo1 · Matthew Garrett · commit 925b108918c9 · 2010-08-03T09:49:07.000-04:00
The .add function must not be declared __init.

Signed-off-by: Thomas Renninger &lt;trenn@suse.de&gt;

CC: Alexey Starikovskiy &lt;astarikovskiy@suse.de&gt;
CC: Len Brown &lt;lenb@kernel.org&gt;
CC: linux-kernel@vger.kernel.org
CC: linux-acpi@vger.kernel.org
CC: platform-driver-x86@vger.kernel.org
Signed-off-by: Matthew Garrett &lt;mjg@redhat.com&gt;
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
@@ -810,7 +810,7 @@ static bool guid_already_parsed(const char *guid_string)
 /*
  * Parse the _WDG method for the GUID data blocks
  */
-static __init acpi_status parse_wdg(acpi_handle handle)
+static acpi_status parse_wdg(acpi_handle handle)
 {
 	struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL};
 	union acpi_object *obj;
@@ -959,7 +959,7 @@ static int acpi_wmi_remove(struct acpi_device *device, int type)
 	return 0;
 }
 
-static int __init acpi_wmi_add(struct acpi_device *device)
+static int acpi_wmi_add(struct acpi_device *device)
 {
 	acpi_status status;
 	int result = 0;

Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ static bool guid_already_parsed(const char *guid_string)`
`810`	`810`	`/*`
`811`	`811`	`* Parse the _WDG method for the GUID data blocks`
`812`	`812`	`*/`
`813`		`-static __init acpi_status parse_wdg(acpi_handle handle)`
	`813`	`+static acpi_status parse_wdg(acpi_handle handle)`
`814`	`814`	`{`
`815`	`815`	`struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL};`
`816`	`816`	`union acpi_object *obj;`
`@@ -959,7 +959,7 @@ static int acpi_wmi_remove(struct acpi_device *device, int type)`
`959`	`959`	`return 0;`
`960`	`960`	`}`
`961`	`961`
`962`		`-static int __init acpi_wmi_add(struct acpi_device *device)`
	`962`	`+static int acpi_wmi_add(struct acpi_device *device)`
`963`	`963`	`{`
`964`	`964`	`acpi_status status;`
`965`	`965`	`int result = 0;`