Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git...

[karo-tx-linux.git] / drivers / power / bq27x00_battery.c

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 181ddece5181afceb5d025fbdcf9bfb7f641f007..e0edaf7de54bcb8b8823f899a74b23dccfd038f6 100644 (file)
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -814,7 +814,8 @@ static int bq27x00_battery_probe(struct i2c_client *client,
        di->bat.name = name;
        di->bus.read = &bq27x00_read_i2c;
 
-       if (bq27x00_powersupply_init(di))
+       retval = bq27x00_powersupply_init(di);
+       if (retval)
                goto batt_failed_3;
 
        i2c_set_clientdata(client, di);
@@ -925,7 +926,7 @@ static int bq27000_read_platform(struct bq27x00_device_info *di, u8 reg,
        return pdata->read(dev, reg);
 }
 
-static int __devinit bq27000_battery_probe(struct platform_device *pdev)
+static int bq27000_battery_probe(struct platform_device *pdev)
 {
        struct bq27x00_device_info *di;
        struct bq27000_platform_data *pdata = pdev->dev.platform_data;
@@ -968,7 +969,7 @@ err_free:
        return ret;
 }
 
-static int __devexit bq27000_battery_remove(struct platform_device *pdev)
+static int bq27000_battery_remove(struct platform_device *pdev)
 {
        struct bq27x00_device_info *di = platform_get_drvdata(pdev);
 
@@ -982,7 +983,7 @@ static int __devexit bq27000_battery_remove(struct platform_device *pdev)
 
 static struct platform_driver bq27000_battery_driver = {
        .probe  = bq27000_battery_probe,
-       .remove = __devexit_p(bq27000_battery_remove),
+       .remove = bq27000_battery_remove,
        .driver = {
                .name = "bq27000-battery",
                .owner = THIS_MODULE,