Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[deliverable/linux.git] / drivers / mfd / menelaus.c

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 998ce8cb3065a5a68dc2c09289e13e68826c341b..ad25bfa3fb02cf76ee6c1afcbe3cd8fcecbd49e5 100644 (file)
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -442,7 +442,7 @@ void menelaus_unregister_mmc_callback(void)
        menelaus_remove_irq_work(MENELAUS_MMC_S2D1_IRQ);
 
        the_menelaus->mmc_callback = NULL;
-       the_menelaus->mmc_callback_data = 0;
+       the_menelaus->mmc_callback_data = NULL;
 }
 EXPORT_SYMBOL(menelaus_unregister_mmc_callback);
 
@@ -466,7 +466,7 @@ static int menelaus_set_voltage(const struct menelaus_vtg *vtg, int mV,
        struct i2c_client *c = the_menelaus->client;
 
        mutex_lock(&the_menelaus->lock);
-       if (vtg == 0)
+       if (!vtg)
                goto set_voltage;
 
        ret = menelaus_read_reg(vtg->vtg_reg);
@@ -1189,7 +1189,7 @@ static int menelaus_probe(struct i2c_client *client,
        int                     rev = 0, val;
        int                     err = 0;
        struct menelaus_platform_data *menelaus_pdata =
-                                       client->dev.platform_data;
+                                       dev_get_platdata(&client->dev);
 
        if (the_menelaus) {
                dev_dbg(&client->dev, "only one %s for now\n",
@@ -1197,7 +1197,7 @@ static int menelaus_probe(struct i2c_client *client,
                return -ENODEV;
        }
 
-       menelaus = kzalloc(sizeof *menelaus, GFP_KERNEL);
+       menelaus = devm_kzalloc(&client->dev, sizeof(*menelaus), GFP_KERNEL);
        if (!menelaus)
                return -ENOMEM;
 
@@ -1210,8 +1210,7 @@ static int menelaus_probe(struct i2c_client *client,
        rev = menelaus_read_reg(MENELAUS_REV);
        if (rev < 0) {
                pr_err(DRIVER_NAME ": device not found");
-               err = -ENODEV;
-               goto fail1;
+               return -ENODEV;
        }
 
        /* Ack and disable all Menelaus interrupts */
@@ -1231,7 +1230,7 @@ static int menelaus_probe(struct i2c_client *client,
                if (err) {
                        dev_dbg(&client->dev,  "can't get IRQ %d, err %d\n",
                                        client->irq, err);
-                       goto fail1;
+                       return err;
                }
        }
 
@@ -1242,7 +1241,7 @@ static int menelaus_probe(struct i2c_client *client,
 
        val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
        if (val < 0)
-               goto fail2;
+               goto fail;
        if (val & (1 << 7))
                menelaus->vcore_hw_mode = 1;
        else
@@ -1251,17 +1250,15 @@ static int menelaus_probe(struct i2c_client *client,
        if (menelaus_pdata != NULL && menelaus_pdata->late_init != NULL) {
                err = menelaus_pdata->late_init(&client->dev);
                if (err < 0)
-                       goto fail2;
+                       goto fail;
        }
 
        menelaus_rtc_init(menelaus);
 
        return 0;
-fail2:
+fail:
        free_irq(client->irq, menelaus);
        flush_work(&menelaus->work);
-fail1:
-       kfree(menelaus);
        return err;
 }
 
@@ -1271,7 +1268,6 @@ static int __exit menelaus_remove(struct i2c_client *client)
 
        free_irq(client->irq, menelaus);
        flush_work(&menelaus->work);
-       kfree(menelaus);
        the_menelaus = NULL;
        return 0;
 }