Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / menelaus.c

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 9f01aef539ddd7a21a3958548b0c856b4138fff6..3ac36f5ccd3e13ddc81b3801ff196ee815742790 100644 (file)
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -532,29 +532,6 @@ static const struct menelaus_vtg_value vcore_values[] = {
        { 1450, 18 },
 };
 
-int menelaus_set_vcore_sw(unsigned int mV)
-{
-       int val, ret;
-       struct i2c_client *c = the_menelaus->client;
-
-       val = menelaus_get_vtg_value(mV, vcore_values,
-                                    ARRAY_SIZE(vcore_values));
-       if (val < 0)
-               return -EINVAL;
-
-       dev_dbg(&c->dev, "Setting VCORE to %d mV (val 0x%02x)\n", mV, val);
-
-       /* Set SW mode and the voltage in one go. */
-       mutex_lock(&the_menelaus->lock);
-       ret = menelaus_write_reg(MENELAUS_VCORE_CTRL1, val);
-       if (ret == 0)
-               the_menelaus->vcore_hw_mode = 0;
-       mutex_unlock(&the_menelaus->lock);
-       msleep(1);
-
-       return ret;
-}
-
 int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV)
 {
        int fval, rval, val, ret;
@@ -1239,7 +1216,7 @@ static int menelaus_probe(struct i2c_client *client,
        err = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
        if (err < 0)
                goto fail;
-       if (err & BIT(7))
+       if (err & VCORE_CTRL1_HW_NSW)
                menelaus->vcore_hw_mode = 1;
        else
                menelaus->vcore_hw_mode = 0;
@@ -1259,7 +1236,7 @@ fail:
        return err;
 }
 
-static int __exit menelaus_remove(struct i2c_client *client)
+static int menelaus_remove(struct i2c_client *client)
 {
        struct menelaus_chip    *menelaus = i2c_get_clientdata(client);
 
@@ -1280,7 +1257,7 @@ static struct i2c_driver menelaus_i2c_driver = {
                .name           = DRIVER_NAME,
        },
        .probe          = menelaus_probe,
-       .remove         = __exit_p(menelaus_remove),
+       .remove         = menelaus_remove,
        .id_table       = menelaus_id,
 };