Commit ea79632d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman

x86: move hp-wmi's probe function to .devinit.text

A pointer to hp_wmi_bios_setup is passed to the core via
platform_driver_register and so the function must not disappear when the
.init sections are discarded.  Otherwise (if also having HOTPLUG=y)
unbinding and binding a device to the driver via sysfs will result in an
oops as does a device being registered late.

An alternative to this patch is using platform_driver_probe instead of
platform_driver_register plus removing the pointer to the probe function
from the struct platform_driver.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Frans Pop <elendil@planet.nl>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarMatthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c2e13037
...@@ -57,7 +57,7 @@ enum hp_wmi_radio { ...@@ -57,7 +57,7 @@ enum hp_wmi_radio {
HPWMI_WWAN = 2, HPWMI_WWAN = 2,
}; };
static int __init hp_wmi_bios_setup(struct platform_device *device); static int __devinit hp_wmi_bios_setup(struct platform_device *device);
static int __exit hp_wmi_bios_remove(struct platform_device *device); static int __exit hp_wmi_bios_remove(struct platform_device *device);
static int hp_wmi_resume_handler(struct device *device); static int hp_wmi_resume_handler(struct device *device);
...@@ -447,7 +447,7 @@ static void cleanup_sysfs(struct platform_device *device) ...@@ -447,7 +447,7 @@ static void cleanup_sysfs(struct platform_device *device)
device_remove_file(&device->dev, &dev_attr_tablet); device_remove_file(&device->dev, &dev_attr_tablet);
} }
static int __init hp_wmi_bios_setup(struct platform_device *device) static int __devinit hp_wmi_bios_setup(struct platform_device *device)
{ {
int err; int err;
int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment