drivers/i2c/busses: don't use devm_pinctrl_get_select_default() in probe

Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 142b694..d09512e 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -43,7 +43,6 @@
 #include <linux/slab.h>
 #include <linux/i2c-omap.h>
 #include <linux/pm_runtime.h>
-#include <linux/pinctrl/consumer.h>
 
 /* I2C controller revisions */
 #define OMAP_I2C_OMAP1_REV_2           0x20
@@ -216,8 +215,6 @@ struct omap_i2c_dev {
        u16                     syscstate;
        u16                     westate;
        u16                     errata;
-
-       struct pinctrl          *pins;
 };
 
 static const u8 reg_map_ip_v1[] = {
@@ -1120,16 +1117,6 @@ omap_i2c_probe(struct platform_device *pdev)
                dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat;
        }
 
-       dev->pins = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(dev->pins)) {
-               if (PTR_ERR(dev->pins) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-
-               dev_warn(&pdev->dev, "did not get pins for i2c error: %li\n",
-                        PTR_ERR(dev->pins));
-               dev->pins = NULL;
-       }
-
        dev->dev = &pdev->dev;
        dev->irq = irq;