Input: wistron - convert to the new platform device interface
Do not use platform_device_register_simple() as it is going away, implement ->probe() and ->remove() functions so manual binding and unbinding would work. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov
parent
9d6c25029d
commit
e7c3aad53d
|
|
@ -174,7 +174,7 @@ static u16 bios_pop_queue(void)
|
|||
return regs.eax;
|
||||
}
|
||||
|
||||
static void __init bios_attach(void)
|
||||
static void __devinit bios_attach(void)
|
||||
{
|
||||
struct regs regs;
|
||||
|
||||
|
|
@ -194,7 +194,7 @@ static void bios_detach(void)
|
|||
call_bios(®s);
|
||||
}
|
||||
|
||||
static u8 __init bios_get_cmos_address(void)
|
||||
static u8 __devinit bios_get_cmos_address(void)
|
||||
{
|
||||
struct regs regs;
|
||||
|
||||
|
|
@ -206,7 +206,7 @@ static u8 __init bios_get_cmos_address(void)
|
|||
return regs.ecx;
|
||||
}
|
||||
|
||||
static u16 __init bios_get_default_setting(u8 subsys)
|
||||
static u16 __devinit bios_get_default_setting(u8 subsys)
|
||||
{
|
||||
struct regs regs;
|
||||
|
||||
|
|
@ -367,7 +367,7 @@ static int __init select_keymap(void)
|
|||
|
||||
static struct input_dev *input_dev;
|
||||
|
||||
static int __init setup_input_dev(void)
|
||||
static int __devinit setup_input_dev(void)
|
||||
{
|
||||
const struct key_entry *key;
|
||||
int error;
|
||||
|
|
@ -466,6 +466,52 @@ static void poll_bios(unsigned long discard)
|
|||
mod_timer(&poll_timer, jiffies + HZ / POLL_FREQUENCY);
|
||||
}
|
||||
|
||||
static int __devinit wistron_probe(struct platform_device *dev)
|
||||
{
|
||||
int err = setup_input_dev();
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
bios_attach();
|
||||
cmos_address = bios_get_cmos_address();
|
||||
|
||||
if (have_wifi) {
|
||||
u16 wifi = bios_get_default_setting(WIFI);
|
||||
if (wifi & 1)
|
||||
wifi_enabled = (wifi & 2) ? 1 : 0;
|
||||
else
|
||||
have_wifi = 0;
|
||||
|
||||
if (have_wifi)
|
||||
bios_set_state(WIFI, wifi_enabled);
|
||||
}
|
||||
|
||||
if (have_bluetooth) {
|
||||
u16 bt = bios_get_default_setting(BLUETOOTH);
|
||||
if (bt & 1)
|
||||
bluetooth_enabled = (bt & 2) ? 1 : 0;
|
||||
else
|
||||
have_bluetooth = 0;
|
||||
|
||||
if (have_bluetooth)
|
||||
bios_set_state(BLUETOOTH, bluetooth_enabled);
|
||||
}
|
||||
|
||||
poll_bios(1); /* Flush stale event queue and arm timer */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit wistron_remove(struct platform_device *dev)
|
||||
{
|
||||
del_timer_sync(&poll_timer);
|
||||
input_unregister_device(input_dev);
|
||||
bios_detach();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int wistron_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
del_timer_sync(&poll_timer);
|
||||
|
|
@ -491,13 +537,20 @@ static int wistron_resume(struct platform_device *dev)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
#define wistron_suspend NULL
|
||||
#define wistron_resume NULL
|
||||
#endif
|
||||
|
||||
static struct platform_driver wistron_driver = {
|
||||
.suspend = wistron_suspend,
|
||||
.resume = wistron_resume,
|
||||
.driver = {
|
||||
.name = "wistron-bios",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = wistron_probe,
|
||||
.remove = __devexit_p(wistron_remove),
|
||||
.suspend = wistron_suspend,
|
||||
.resume = wistron_resume,
|
||||
};
|
||||
|
||||
static int __init wb_module_init(void)
|
||||
|
|
@ -512,55 +565,27 @@ static int __init wb_module_init(void)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
bios_attach();
|
||||
cmos_address = bios_get_cmos_address();
|
||||
|
||||
err = platform_driver_register(&wistron_driver);
|
||||
if (err)
|
||||
goto err_detach_bios;
|
||||
goto err_unmap_bios;
|
||||
|
||||
wistron_device = platform_device_register_simple("wistron-bios", -1, NULL, 0);
|
||||
if (IS_ERR(wistron_device)) {
|
||||
err = PTR_ERR(wistron_device);
|
||||
wistron_device = platform_device_alloc("wistron-bios", -1);
|
||||
if (!wistron_device) {
|
||||
err = -ENOMEM;
|
||||
goto err_unregister_driver;
|
||||
}
|
||||
|
||||
if (have_wifi) {
|
||||
u16 wifi = bios_get_default_setting(WIFI);
|
||||
if (wifi & 1)
|
||||
wifi_enabled = (wifi & 2) ? 1 : 0;
|
||||
else
|
||||
have_wifi = 0;
|
||||
|
||||
if (have_wifi)
|
||||
bios_set_state(WIFI, wifi_enabled);
|
||||
}
|
||||
|
||||
if (have_bluetooth) {
|
||||
u16 bt = bios_get_default_setting(BLUETOOTH);
|
||||
if (bt & 1)
|
||||
bluetooth_enabled = (bt & 2) ? 1 : 0;
|
||||
else
|
||||
have_bluetooth = 0;
|
||||
|
||||
if (have_bluetooth)
|
||||
bios_set_state(BLUETOOTH, bluetooth_enabled);
|
||||
}
|
||||
|
||||
err = setup_input_dev();
|
||||
err = platform_device_add(wistron_device);
|
||||
if (err)
|
||||
goto err_unregister_device;
|
||||
|
||||
poll_bios(1); /* Flush stale event queue and arm timer */
|
||||
goto err_free_device;
|
||||
|
||||
return 0;
|
||||
|
||||
err_unregister_device:
|
||||
platform_device_unregister(wistron_device);
|
||||
err_free_device:
|
||||
platform_device_put(wistron_device);
|
||||
err_unregister_driver:
|
||||
platform_driver_unregister(&wistron_driver);
|
||||
err_detach_bios:
|
||||
bios_detach();
|
||||
err_unmap_bios:
|
||||
unmap_bios();
|
||||
|
||||
return err;
|
||||
|
|
@ -568,11 +593,8 @@ static int __init wb_module_init(void)
|
|||
|
||||
static void __exit wb_module_exit(void)
|
||||
{
|
||||
del_timer_sync(&poll_timer);
|
||||
input_unregister_device(input_dev);
|
||||
platform_device_unregister(wistron_device);
|
||||
platform_driver_unregister(&wistron_driver);
|
||||
bios_detach();
|
||||
unmap_bios();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue