3 files changed, 4 insertions, 10 deletions

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 72f2e789ab83..c0f608e3ca9e 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -411,14 +411,10 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
         ret = of_property_read_u32(np, "ti,vmbch-threshold", &prop);
         if (!ret)
                 board_info->vmbch_threshold = prop;
-        else if (*chip_id == TPS65911)
-                dev_warn(&client->dev, "VMBCH-Threshold not specified");
 
         ret = of_property_read_u32(np, "ti,vmbch2-threshold", &prop);
         if (!ret)
                 board_info->vmbch2_threshold = prop;
-        else if (*chip_id == TPS65911)
-                dev_warn(&client->dev, "VMBCH2-Threshold not specified");
 
         prop = of_property_read_bool(np, "ti,en-ck32k-xtal");
         board_info->en_ck32k_xtal = prop;
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index 7361dbe96be8..0779d5ab9ab1 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -565,13 +565,13 @@ static int twl6040_probe(struct i2c_client *client,
                                       twl6040->supplies);
         if (ret != 0) {
                 dev_err(&client->dev, "Failed to get supplies: %d\n", ret);
-                goto regulator_get_err;
+                return ret;
         }
 
         ret = regulator_bulk_enable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
         if (ret != 0) {
                 dev_err(&client->dev, "Failed to enable supplies: %d\n", ret);
-                goto regulator_get_err;
+                return ret;
         }
 
         twl6040->dev = &client->dev;
@@ -667,9 +667,6 @@ readyirq_err:
         regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
 gpio_err:
         regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
-regulator_get_err:
-        i2c_set_clientdata(client, NULL);
-
         return ret;
 }
 
@@ -683,7 +680,6 @@ static int twl6040_remove(struct i2c_client *client)
         regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
 
         mfd_remove_devices(&client->dev);
-        i2c_set_clientdata(client, NULL);
 
         regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
 
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index a10380bfbeac..7d3ae2be6869 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -70,6 +70,8 @@ struct regmap_range {
         unsigned int range_max;
 };
 
+#define regmap_reg_range(low, high) { .range_min = low, .range_max = high, }
+
 /*
  * A table of ranges including some yes ranges and some no ranges.
  * If a register belongs to a no_range, the corresponding check function