diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-07-10 11:57:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 18:21:13 -0400 |
commit | e84f54fc58ada30f67b7353f6c16c3c4aa7c8da5 (patch) | |
tree | dabfb3d0c86bd802d23df469edec999428180605 /drivers/tty/serial/omap-serial.c | |
parent | f3c909b42902034dd1e54abdc770c6284fe3fb7e (diff) |
drivers/tty/serial: 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>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index b6d172873076..eacb0def3d96 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <linux/pm_runtime.h> | 40 | #include <linux/pm_runtime.h> |
41 | #include <linux/of.h> | 41 | #include <linux/of.h> |
42 | #include <linux/gpio.h> | 42 | #include <linux/gpio.h> |
43 | #include <linux/pinctrl/consumer.h> | ||
44 | #include <linux/platform_data/serial-omap.h> | 43 | #include <linux/platform_data/serial-omap.h> |
45 | 44 | ||
46 | #define OMAP_MAX_HSUART_PORTS 6 | 45 | #define OMAP_MAX_HSUART_PORTS 6 |
@@ -160,7 +159,6 @@ struct uart_omap_port { | |||
160 | u32 latency; | 159 | u32 latency; |
161 | u32 calc_latency; | 160 | u32 calc_latency; |
162 | struct work_struct qos_work; | 161 | struct work_struct qos_work; |
163 | struct pinctrl *pins; | ||
164 | bool is_suspending; | 162 | bool is_suspending; |
165 | }; | 163 | }; |
166 | 164 | ||
@@ -1468,13 +1466,6 @@ static int serial_omap_probe(struct platform_device *pdev) | |||
1468 | goto err_port_line; | 1466 | goto err_port_line; |
1469 | } | 1467 | } |
1470 | 1468 | ||
1471 | up->pins = devm_pinctrl_get_select_default(&pdev->dev); | ||
1472 | if (IS_ERR(up->pins)) { | ||
1473 | dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n", | ||
1474 | up->port.line, PTR_ERR(up->pins)); | ||
1475 | up->pins = NULL; | ||
1476 | } | ||
1477 | |||
1478 | sprintf(up->name, "OMAP UART%d", up->port.line); | 1469 | sprintf(up->name, "OMAP UART%d", up->port.line); |
1479 | up->port.mapbase = mem->start; | 1470 | up->port.mapbase = mem->start; |
1480 | up->port.membase = devm_ioremap(&pdev->dev, mem->start, | 1471 | up->port.membase = devm_ioremap(&pdev->dev, mem->start, |