diff options
| author |   Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-06 15:05:51 -0300 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2013-06-12 20:39:06 +0200 |
| commit | dfda7d8f09323163cad26dd35fe6293b4f7cee85 (patch) | |
| tree | 6dc7bbf617dc4175fe0793ef260db6f04540aae1 /drivers/i2c | |
| parent | i2c: imx: Let device core handle pinctrl (diff) | |
| download | linux-dev-dfda7d8f09323163cad26dd35fe6293b4f7cee85.tar.xz linux-dev-dfda7d8f09323163cad26dd35fe6293b4f7cee85.zip | |
i2c: mxs: Let device core handle pinctrl
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>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mxs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 2039f230482d..df8ff5aea5b5 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -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; |