Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / power / ds2760_battery.c

diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index 00e1ea6..71be36f 100644 (file)
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -254,8 +254,6 @@ static void ds2760_battery_update_status(struct ds2760_device_info *di)
 
        if (di->charge_status != old_charge_status)
                power_supply_changed(&di->bat);
-
-       return;
 }
 
 static void ds2760_battery_work(struct work_struct *work)
@@ -264,12 +262,10 @@ static void ds2760_battery_work(struct work_struct *work)
                struct ds2760_device_info, monitor_work.work);
        const int interval = HZ * 60;
 
-       dev_dbg(di->dev, "%s\n", __FUNCTION__);
+       dev_dbg(di->dev, "%s\n", __func__);
 
        ds2760_battery_update_status(di);
        queue_delayed_work(di->monitor_wqueue, &di->monitor_work, interval);
-
-       return;
 }
 
 #define to_ds2760_device_info(x) container_of((x), struct ds2760_device_info, \
@@ -279,12 +275,10 @@ static void ds2760_battery_external_power_changed(struct power_supply *psy)
 {
        struct ds2760_device_info *di = to_ds2760_device_info(psy);
 
-       dev_dbg(di->dev, "%s\n", __FUNCTION__);
+       dev_dbg(di->dev, "%s\n", __func__);
 
        cancel_delayed_work(&di->monitor_work);
        queue_delayed_work(di->monitor_wqueue, &di->monitor_work, HZ/10);
-
-       return;
 }
 
 static int ds2760_battery_get_property(struct power_supply *psy,
@@ -372,7 +366,7 @@ static int ds2760_battery_probe(struct platform_device *pdev)
 
        retval = power_supply_register(&pdev->dev, &di->bat);
        if (retval) {
-               dev_err(di->dev, "failed to register battery");
+               dev_err(di->dev, "failed to register battery\n");
                goto batt_failed;
        }
 
@@ -457,7 +451,6 @@ static int __init ds2760_battery_init(void)
 static void __exit ds2760_battery_exit(void)
 {
        platform_driver_unregister(&ds2760_battery_driver);
-       return;
 }
 
 module_init(ds2760_battery_init);