Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / drivers / regulator / max8952.c

diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index c0ab4dd..910c9b2 100644 (file)
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -69,11 +69,6 @@ static int max8952_write_reg(struct max8952_data *max8952,
        return i2c_smbus_write_byte_data(max8952->client, reg, value);
 }
 
-static int max8952_voltage(struct max8952_data *max8952, u8 mode)
-{
-       return (max8952->pdata->dvs_mode[mode] * 10 + 770) * 1000;
-}
-
 static int max8952_list_voltage(struct regulator_dev *rdev,
                unsigned int selector)
 {
@@ -82,7 +77,7 @@ static int max8952_list_voltage(struct regulator_dev *rdev,
        if (rdev_get_id(rdev) != 0)
                return -EINVAL;
 
-       return max8952_voltage(max8952, selector);
+       return (max8952->pdata->dvs_mode[selector] * 10 + 770) * 1000;
 }
 
 static int max8952_is_enabled(struct regulator_dev *rdev)
@@ -117,7 +112,7 @@ static int max8952_disable(struct regulator_dev *rdev)
        return 0;
 }
 
-static int max8952_get_voltage(struct regulator_dev *rdev)
+static int max8952_get_voltage_sel(struct regulator_dev *rdev)
 {
        struct max8952_data *max8952 = rdev_get_drvdata(rdev);
        u8 vid = 0;
@@ -127,7 +122,7 @@ static int max8952_get_voltage(struct regulator_dev *rdev)
        if (max8952->vid1)
                vid += 2;
 
-       return max8952_voltage(max8952, vid);
+       return vid;
 }
 
 static int max8952_set_voltage_sel(struct regulator_dev *rdev,
@@ -154,7 +149,7 @@ static struct regulator_ops max8952_ops = {
        .is_enabled             = max8952_is_enabled,
        .enable                 = max8952_enable,
        .disable                = max8952_disable,
-       .get_voltage            = max8952_get_voltage,
+       .get_voltage_sel        = max8952_get_voltage_sel,
        .set_voltage_sel        = max8952_set_voltage_sel,
        .set_suspend_disable    = max8952_disable,
 };
@@ -186,7 +181,8 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
                return -EIO;
 
-       max8952 = kzalloc(sizeof(struct max8952_data), GFP_KERNEL);
+       max8952 = devm_kzalloc(&client->dev, sizeof(struct max8952_data),
+                              GFP_KERNEL);
        if (!max8952)
                return -ENOMEM;
 
@@ -203,7 +199,7 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
        if (IS_ERR(max8952->rdev)) {
                ret = PTR_ERR(max8952->rdev);
                dev_err(max8952->dev, "regulator init failed (%d)\n", ret);
-               goto err_reg;
+               return ret;
        }
 
        max8952->en = !!(pdata->reg_data.constraints.boot_on);
@@ -300,10 +296,6 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
        i2c_set_clientdata(client, max8952);
 
        return 0;
-
-err_reg:
-       kfree(max8952);
-       return ret;
 }
 
 static int __devexit max8952_pmic_remove(struct i2c_client *client)
@@ -317,8 +309,6 @@ static int __devexit max8952_pmic_remove(struct i2c_client *client)
        gpio_free(pdata->gpio_vid0);
        gpio_free(pdata->gpio_vid1);
        gpio_free(pdata->gpio_en);
-
-       kfree(max8952);
        return 0;
 }