Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Wolfram Sang and committed by
Greg Kroah-Hartman
e84f54fc f3c909b4

-34
-8
drivers/tty/serial/atmel_serial.c
··· 39 39 #include <linux/atmel_pdc.h> 40 40 #include <linux/atmel_serial.h> 41 41 #include <linux/uaccess.h> 42 - #include <linux/pinctrl/consumer.h> 43 42 #include <linux/platform_data/atmel.h> 44 43 45 44 #include <asm/io.h> ··· 1774 1775 struct atmel_uart_data *pdata = pdev->dev.platform_data; 1775 1776 void *data; 1776 1777 int ret = -ENODEV; 1777 - struct pinctrl *pinctrl; 1778 1778 1779 1779 BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1)); 1780 1780 ··· 1806 1808 ret = atmel_init_port(port, pdev); 1807 1809 if (ret) 1808 1810 goto err; 1809 - 1810 - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); 1811 - if (IS_ERR(pinctrl)) { 1812 - ret = PTR_ERR(pinctrl); 1813 - goto err; 1814 - } 1815 1811 1816 1812 if (!atmel_use_dma_rx(&port->uart)) { 1817 1813 ret = -ENOMEM;
-9
drivers/tty/serial/imx.c
··· 47 47 #include <linux/slab.h> 48 48 #include <linux/of.h> 49 49 #include <linux/of_device.h> 50 - #include <linux/pinctrl/consumer.h> 51 50 #include <linux/io.h> 52 51 53 52 #include <asm/irq.h> ··· 1506 1507 void __iomem *base; 1507 1508 int ret = 0; 1508 1509 struct resource *res; 1509 - struct pinctrl *pinctrl; 1510 1510 1511 1511 sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL); 1512 1512 if (!sport) ··· 1540 1542 init_timer(&sport->timer); 1541 1543 sport->timer.function = imx_timeout; 1542 1544 sport->timer.data = (unsigned long)sport; 1543 - 1544 - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); 1545 - if (IS_ERR(pinctrl)) { 1546 - ret = PTR_ERR(pinctrl); 1547 - dev_err(&pdev->dev, "failed to get default pinctrl: %d\n", ret); 1548 - return ret; 1549 - } 1550 1545 1551 1546 sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); 1552 1547 if (IS_ERR(sport->clk_ipg)) {
-8
drivers/tty/serial/mxs-auart.c
··· 32 32 #include <linux/clk.h> 33 33 #include <linux/delay.h> 34 34 #include <linux/io.h> 35 - #include <linux/pinctrl/consumer.h> 36 35 #include <linux/of_device.h> 37 36 #include <linux/dma-mapping.h> 38 37 #include <linux/dmaengine.h> ··· 1014 1015 u32 version; 1015 1016 int ret = 0; 1016 1017 struct resource *r; 1017 - struct pinctrl *pinctrl; 1018 1018 1019 1019 s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL); 1020 1020 if (!s) { ··· 1026 1028 s->port.line = pdev->id < 0 ? 0 : pdev->id; 1027 1029 else if (ret < 0) 1028 1030 goto out_free; 1029 - 1030 - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); 1031 - if (IS_ERR(pinctrl)) { 1032 - ret = PTR_ERR(pinctrl); 1033 - goto out_free; 1034 - } 1035 1031 1036 1032 if (of_id) { 1037 1033 pdev->id_entry = of_id->data;
-9
drivers/tty/serial/omap-serial.c
··· 40 40 #include <linux/pm_runtime.h> 41 41 #include <linux/of.h> 42 42 #include <linux/gpio.h> 43 - #include <linux/pinctrl/consumer.h> 44 43 #include <linux/platform_data/serial-omap.h> 45 44 46 45 #define OMAP_MAX_HSUART_PORTS 6 ··· 159 160 u32 latency; 160 161 u32 calc_latency; 161 162 struct work_struct qos_work; 162 - struct pinctrl *pins; 163 163 bool is_suspending; 164 164 }; 165 165 ··· 1464 1466 up->port.line); 1465 1467 ret = -ENODEV; 1466 1468 goto err_port_line; 1467 - } 1468 - 1469 - up->pins = devm_pinctrl_get_select_default(&pdev->dev); 1470 - if (IS_ERR(up->pins)) { 1471 - dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n", 1472 - up->port.line, PTR_ERR(up->pins)); 1473 - up->pins = NULL; 1474 1469 } 1475 1470 1476 1471 sprintf(up->name, "OMAP UART%d", up->port.line);