Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / drivers / power / olpc_battery.c

diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index 46a2f07edab10cf47ef40eee8438e66d9474ac0c..7385092f9bc8a98a8dc09155238d6ee924ab6034 100644 (file)
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -525,14 +525,6 @@ static struct power_supply olpc_bat = {
        .use_for_apm = 1,
 };
 
-void olpc_battery_trigger_uevent(unsigned long cause)
-{
-       if (cause & EC_SCI_SRC_ACPWR)
-               kobject_uevent(&olpc_ac.dev->kobj, KOBJ_CHANGE);
-       if (cause & (EC_SCI_SRC_BATERR|EC_SCI_SRC_BATSOC|EC_SCI_SRC_BATTERY))
-               kobject_uevent(&olpc_bat.dev->kobj, KOBJ_CHANGE);
-}
-
 static int olpc_battery_suspend(struct platform_device *pdev,
                                pm_message_t state)
 {
@@ -627,7 +619,7 @@ static const struct of_device_id olpc_battery_ids[] __devinitconst = {
 };
 MODULE_DEVICE_TABLE(of, olpc_battery_ids);
 
-static struct platform_driver olpc_battery_drv = {
+static struct platform_driver olpc_battery_driver = {
        .driver = {
                .name = "olpc-battery",
                .owner = THIS_MODULE,
@@ -638,17 +630,7 @@ static struct platform_driver olpc_battery_drv = {
        .suspend = olpc_battery_suspend,
 };
 
-static int __init olpc_bat_init(void)
-{
-       return platform_driver_register(&olpc_battery_drv);
-}
-module_init(olpc_bat_init);
-
-static void __exit olpc_bat_exit(void)
-{
-       platform_driver_unregister(&olpc_battery_drv);
-}
-module_exit(olpc_bat_exit);
+module_platform_driver(olpc_battery_driver);
 
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
 MODULE_LICENSE("GPL");