clk: samsung: Fix double add of syscore ops after driver rebind

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

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 5e2667afe2bc02c6c60cb1743f1c98dc4788ce91..9f01aef539ddd7a21a3958548b0c856b4138fff6 100644 (file)
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -466,8 +466,6 @@ 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)
-               goto set_voltage;
 
        ret = menelaus_read_reg(vtg->vtg_reg);
        if (ret < 0)
@@ -482,7 +480,6 @@ static int menelaus_set_voltage(const struct menelaus_vtg *vtg, int mV,
        ret = menelaus_write_reg(vtg->vtg_reg, val);
        if (ret < 0)
                goto out;
-set_voltage:
        ret = menelaus_write_reg(vtg->mode_reg, mode);
 out:
        mutex_unlock(&the_menelaus->lock);
@@ -1186,7 +1183,7 @@ static int menelaus_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
        struct menelaus_chip    *menelaus;
-       int                     rev = 0, val;
+       int                     rev = 0;
        int                     err = 0;
        struct menelaus_platform_data *menelaus_pdata =
                                        dev_get_platdata(&client->dev);
@@ -1239,10 +1236,10 @@ static int menelaus_probe(struct i2c_client *client,
 
        pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
 
-       val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
-       if (val < 0)
+       err = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
+       if (err < 0)
                goto fail;
-       if (val & (1 << 7))
+       if (err & BIT(7))
                menelaus->vcore_hw_mode = 1;
        else
                menelaus->vcore_hw_mode = 0;