diff options
| author |   Wolfram Sang <wsa@the-dreams.de> | 2013-07-10 16:57:46 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 15:21:13 -0700 |
| commit | e84f54fc58ada30f67b7353f6c16c3c4aa7c8da5 (patch) | |
| tree | dabfb3d0c86bd802d23df469edec999428180605 /drivers/tty/serial/omap-serial.c | |
| parent | Drivers: tty: n_gsm.c: fixed 7 errors & 6 warnings that checkpatch complained (diff) | |
| download | linux-dev-e84f54fc58ada30f67b7353f6c16c3c4aa7c8da5.tar.xz linux-dev-e84f54fc58ada30f67b7353f6c16c3c4aa7c8da5.zip | |
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 @@ #include <linux/pm_runtime.h> #include <linux/of.h> #include <linux/gpio.h> -#include <linux/pinctrl/consumer.h> #include <linux/platform_data/serial-omap.h> #define OMAP_MAX_HSUART_PORTS 6 @@ -160,7 +159,6 @@ struct uart_omap_port { u32 latency; u32 calc_latency; struct work_struct qos_work; - struct pinctrl *pins; bool is_suspending; }; @@ -1468,13 +1466,6 @@ static int serial_omap_probe(struct platform_device *pdev) goto err_port_line; } - up->pins = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(up->pins)) { - dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n", - up->port.line, PTR_ERR(up->pins)); - up->pins = NULL; - } - sprintf(up->name, "OMAP UART%d", up->port.line); up->port.mapbase = mem->start; up->port.membase = devm_ioremap(&pdev->dev, mem->start, |