diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-07-10 11:57:37 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-08-07 11:36:30 -0400 |
commit | 3f97b62faba952baca59307ef38e8e5594405fb9 (patch) | |
tree | 1f227c785653994cefaa6dcb42f5bcbb7c5e1620 /drivers/i2c | |
parent | 421476aeed56a8d19c890ae6729e3c43b740da7a (diff) |
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>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 142b694d1c60..d09512e4f488 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/i2c-omap.h> | 44 | #include <linux/i2c-omap.h> |
45 | #include <linux/pm_runtime.h> | 45 | #include <linux/pm_runtime.h> |
46 | #include <linux/pinctrl/consumer.h> | ||
47 | 46 | ||
48 | /* I2C controller revisions */ | 47 | /* I2C controller revisions */ |
49 | #define OMAP_I2C_OMAP1_REV_2 0x20 | 48 | #define OMAP_I2C_OMAP1_REV_2 0x20 |
@@ -216,8 +215,6 @@ struct omap_i2c_dev { | |||
216 | u16 syscstate; | 215 | u16 syscstate; |
217 | u16 westate; | 216 | u16 westate; |
218 | u16 errata; | 217 | u16 errata; |
219 | |||
220 | struct pinctrl *pins; | ||
221 | }; | 218 | }; |
222 | 219 | ||
223 | static const u8 reg_map_ip_v1[] = { | 220 | static const u8 reg_map_ip_v1[] = { |
@@ -1120,16 +1117,6 @@ omap_i2c_probe(struct platform_device *pdev) | |||
1120 | dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat; | 1117 | dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat; |
1121 | } | 1118 | } |
1122 | 1119 | ||
1123 | dev->pins = devm_pinctrl_get_select_default(&pdev->dev); | ||
1124 | if (IS_ERR(dev->pins)) { | ||
1125 | if (PTR_ERR(dev->pins) == -EPROBE_DEFER) | ||
1126 | return -EPROBE_DEFER; | ||
1127 | |||
1128 | dev_warn(&pdev->dev, "did not get pins for i2c error: %li\n", | ||
1129 | PTR_ERR(dev->pins)); | ||
1130 | dev->pins = NULL; | ||
1131 | } | ||
1132 | |||
1133 | dev->dev = &pdev->dev; | 1120 | dev->dev = &pdev->dev; |
1134 | dev->irq = irq; | 1121 | dev->irq = irq; |
1135 | 1122 | ||