Merge remote-tracking branch 'regulator/fix/doc' into tmp

[linux-2.6-microblaze.git] / drivers / mfd / 88pm80x.c

diff --git a/drivers/mfd/88pm80x.c b/drivers/mfd/88pm80x.c
index 1adb355..f736a46 100644 (file)
--- a/drivers/mfd/88pm80x.c
+++ b/drivers/mfd/88pm80x.c
@@ -48,14 +48,12 @@ int pm80x_init(struct i2c_client *client,
                ret = PTR_ERR(map);
                dev_err(&client->dev, "Failed to allocate register map: %d\n",
                        ret);
-               goto err_regmap_init;
+               return ret;
        }
 
        chip->id = id->driver_data;
-       if (chip->id < CHIP_PM800 || chip->id > CHIP_PM805) {
-               ret = -EINVAL;
-               goto err_chip_id;
-       }
+       if (chip->id < CHIP_PM800 || chip->id > CHIP_PM805)
+               return -EINVAL;
 
        chip->client = client;
        chip->regmap = map;
@@ -82,19 +80,11 @@ int pm80x_init(struct i2c_client *client,
        }
 
        return 0;
-
-err_chip_id:
-       regmap_exit(map);
-err_regmap_init:
-       devm_kfree(&client->dev, chip);
-       return ret;
 }
 EXPORT_SYMBOL_GPL(pm80x_init);
 
-int pm80x_deinit(struct i2c_client *client)
+int pm80x_deinit(void)
 {
-       struct pm80x_chip *chip = i2c_get_clientdata(client);
-
        /*
         * workaround: clear the dependency between pm800 and pm805.
         * would remove it after HW chip fixes the issue.
@@ -103,10 +93,6 @@ int pm80x_deinit(struct i2c_client *client)
                g_pm80x_chip->companion = NULL;
        else
                g_pm80x_chip = NULL;
-
-       regmap_exit(chip->regmap);
-       devm_kfree(&client->dev, chip);
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(pm80x_deinit);