Merge branch 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[linux-2.6-omap-h63xx.git] / drivers / power / pmu_battery.c

diff --git a/drivers/power/pmu_battery.c b/drivers/power/pmu_battery.c
index 2fea4af0e40aad8ab4280153d44ff8c2673ca8b4..9346a862f1f2609bd5bdf834357c65d0bf24803e 100644 (file)
--- a/drivers/power/pmu_battery.c
+++ b/drivers/power/pmu_battery.c
@@ -159,7 +159,7 @@ static int __init pmu_bat_init(void)
                if (!pbat)
                        break;
 
-               sprintf(pbat->name, "PMU battery %d", i);
+               sprintf(pbat->name, "PMU_battery_%d", i);
                pbat->bat.name = pbat->name;
                pbat->bat.properties = pmu_bat_props;
                pbat->bat.num_properties = ARRAY_SIZE(pmu_bat_props);
@@ -203,8 +203,6 @@ static void __exit pmu_bat_exit(void)
        }
        power_supply_unregister(&pmu_ac);
        platform_device_unregister(bat_pdev);
-
-       return;
 }
 
 module_init(pmu_bat_init);