diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-06 14:05:51 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-06-12 14:39:06 -0400 |
commit | dfda7d8f09323163cad26dd35fe6293b4f7cee85 (patch) | |
tree | 6dc7bbf617dc4175fe0793ef260db6f04540aae1 /drivers/i2c | |
parent | 76b1f723c4f54c2ab05307da3cc5c39e421b029b (diff) |
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 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/jiffies.h> | 25 | #include <linux/jiffies.h> |
26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
27 | #include <linux/pinctrl/consumer.h> | ||
28 | #include <linux/stmp_device.h> | 27 | #include <linux/stmp_device.h> |
29 | #include <linux/of.h> | 28 | #include <linux/of.h> |
30 | #include <linux/of_device.h> | 29 | #include <linux/of_device.h> |
@@ -638,15 +637,10 @@ static int mxs_i2c_probe(struct platform_device *pdev) | |||
638 | struct device *dev = &pdev->dev; | 637 | struct device *dev = &pdev->dev; |
639 | struct mxs_i2c_dev *i2c; | 638 | struct mxs_i2c_dev *i2c; |
640 | struct i2c_adapter *adap; | 639 | struct i2c_adapter *adap; |
641 | struct pinctrl *pinctrl; | ||
642 | struct resource *res; | 640 | struct resource *res; |
643 | resource_size_t res_size; | 641 | resource_size_t res_size; |
644 | int err, irq; | 642 | int err, irq; |
645 | 643 | ||
646 | pinctrl = devm_pinctrl_get_select_default(dev); | ||
647 | if (IS_ERR(pinctrl)) | ||
648 | return PTR_ERR(pinctrl); | ||
649 | |||
650 | i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL); | 644 | i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL); |
651 | if (!i2c) | 645 | if (!i2c) |
652 | return -ENOMEM; | 646 | return -ENOMEM; |