i2c: mxs: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 6 May 2013 18:05:51 +0000 (15:05 -0300)
committerWolfram Sang <wsa@the-dreams.de>
Wed, 12 Jun 2013 18:39:06 +0000 (20:39 +0200)
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for handling pinctrl.

So remove devm_pinctrl_get_select_default() from the driver.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-mxs.c

index 2039f23..df8ff5a 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/platform_device.h>
 #include <linux/jiffies.h>
 #include <linux/io.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/stmp_device.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -638,15 +637,10 @@ static int mxs_i2c_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct mxs_i2c_dev *i2c;
        struct i2c_adapter *adap;
-       struct pinctrl *pinctrl;
        struct resource *res;
        resource_size_t res_size;
        int err, irq;
 
-       pinctrl = devm_pinctrl_get_select_default(dev);
-       if (IS_ERR(pinctrl))
-               return PTR_ERR(pinctrl);
-
        i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL);
        if (!i2c)
                return -ENOMEM;