adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'tc1100-wmi' into release

Browse source
This commit is contained in:
Len Brown 2009-12-24 01:17:46 -05:00
commit 78a5331ddd
1 changed files with 55 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
drivers/platform/x86/tc1100-wmi.c
View file

@ -47,22 +47,6 @@ MODULE_DESCRIPTION("HP Compaq TC1100 Tablet WMI Extras");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("wmi:C364AC71-36DB-495A-8494-B439D472A505"); MODULE_ALIAS("wmi:C364AC71-36DB-495A-8494-B439D472A505");
static int tc1100_probe(struct platform_device *device);
static int tc1100_remove(struct platform_device *device);
static int tc1100_suspend(struct platform_device *device, pm_message_t state);
static int tc1100_resume(struct platform_device *device);
static struct platform_driver tc1100_driver = {
.driver = {
.name = "tc1100-wmi",
.owner = THIS_MODULE,
},
.probe = tc1100_probe,
.remove = tc1100_remove,
.suspend = tc1100_suspend,
.resume = tc1100_resume,
};
static struct platform_device *tc1100_device; static struct platform_device *tc1100_device;
struct tc1100_data { struct tc1100_data {
@ -183,51 +167,35 @@ static DEVICE_ATTR(value, S_IWUGO | S_IRUGO | S_IWUSR, \
show_set_bool(wireless, TC1100_INSTANCE_WIRELESS); show_set_bool(wireless, TC1100_INSTANCE_WIRELESS);
show_set_bool(jogdial, TC1100_INSTANCE_JOGDIAL); show_set_bool(jogdial, TC1100_INSTANCE_JOGDIAL);
static void remove_fs(void) static struct attribute *tc1100_attributes[] = {
{ &dev_attr_wireless.attr,
device_remove_file(&tc1100_device->dev, &dev_attr_wireless); &dev_attr_jogdial.attr,
device_remove_file(&tc1100_device->dev, &dev_attr_jogdial); NULL
} };
static int add_fs(void) static struct attribute_group tc1100_attribute_group = {
{ .attrs = tc1100_attributes,
int ret; };
ret = device_create_file(&tc1100_device->dev, &dev_attr_wireless);
if (ret)
goto add_sysfs_error;
ret = device_create_file(&tc1100_device->dev, &dev_attr_jogdial);
if (ret)
goto add_sysfs_error;
return ret;
add_sysfs_error:
remove_fs();
return ret;
}
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Driver Model Driver Model
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
static int tc1100_probe(struct platform_device *device) static int __init tc1100_probe(struct platform_device *device)
{ {
int result = 0; return sysfs_create_group(&device->dev.kobj, &tc1100_attribute_group);
result = add_fs();
return result;
} }
static int tc1100_remove(struct platform_device *device) static int __devexit tc1100_remove(struct platform_device *device)
{ {
remove_fs(); sysfs_remove_group(&device->dev.kobj, &tc1100_attribute_group);
return 0; return 0;
} }
static int tc1100_suspend(struct platform_device *dev, pm_message_t state) #ifdef CONFIG_PM
static int tc1100_suspend(struct device *dev)
{ {
int ret; int ret;
@ -239,10 +207,10 @@ static int tc1100_suspend(struct platform_device *dev, pm_message_t state)
if (ret) if (ret)
return ret; return ret;
return ret; return 0;
} }
static int tc1100_resume(struct platform_device *dev) static int tc1100_resume(struct device *dev)
{ {
int ret; int ret;
@ -254,34 +222,61 @@ static int tc1100_resume(struct platform_device *dev)
if (ret) if (ret)
return ret; return ret;
return ret; return 0;
} }
static const struct dev_pm_ops tc1100_pm_ops = {
.suspend = tc1100_suspend,
.resume = tc1100_resume,
.freeze = tc1100_suspend,
.restore = tc1100_resume,
};
#endif
static struct platform_driver tc1100_driver = {
.driver = {
.name = "tc1100-wmi",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &tc1100_pm_ops,
#endif
},
.remove = __devexit_p(tc1100_remove),
};
static int __init tc1100_init(void) static int __init tc1100_init(void)
{ {
int result = 0; int error;
if (!wmi_has_guid(GUID)) if (!wmi_has_guid(GUID))
return -ENODEV; return -ENODEV;
result = platform_driver_register(&tc1100_driver);
if (result)
return result;
tc1100_device = platform_device_alloc("tc1100-wmi", -1); tc1100_device = platform_device_alloc("tc1100-wmi", -1);
platform_device_add(tc1100_device); if (!tc1100_device)
return -ENOMEM;
error = platform_device_add(tc1100_device);
if (error)
goto err_device_put;
error = platform_driver_probe(&tc1100_driver, tc1100_probe);
if (error)
goto err_device_del;
printk(TC1100_INFO "HP Compaq TC1100 Tablet WMI Extras loaded\n"); printk(TC1100_INFO "HP Compaq TC1100 Tablet WMI Extras loaded\n");
return 0;
return result; err_device_del:
platform_device_del(tc1100_device);
err_device_put:
platform_device_put(tc1100_device);
return error;
} }
static void __exit tc1100_exit(void) static void __exit tc1100_exit(void)
{ {
platform_device_del(tc1100_device); platform_device_unregister(tc1100_device);
platform_driver_unregister(&tc1100_driver); platform_driver_unregister(&tc1100_driver);
printk(TC1100_INFO "HP Compaq TC1100 Tablet WMI Extras unloaded\n");
} }
module_init(tc1100_init); module_init(tc1100_init);