Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e84f54fc authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

drivers/tty/serial: don't use devm_pinctrl_get_select_default() in probe 



Since commit ab78029e (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: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3c909b4

drivers/tty/serial/atmel_serial.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <linux/atmel_pdc.h>

#include <linux/atmel_pdc.h>

#include <linux/atmel_serial.h>

#include <linux/atmel_serial.h>

#include <linux/uaccess.h>

#include <linux/uaccess.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_data/atmel.h>

#include <linux/platform_data/atmel.h>





#include <asm/io.h>

#include <asm/io.h>
@@ -1775,7 +1774,6 @@ static int atmel_serial_probe(struct platform_device *pdev) 
	struct atmel_uart_data *pdata = pdev->dev.platform_data;

	struct atmel_uart_data *pdata = pdev->dev.platform_data;

	void *data;

	void *data;

	int ret = -ENODEV;

	int ret = -ENODEV;

	struct pinctrl *pinctrl;





	BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));

	BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));
@@ -1809,12 +1807,6 @@ static int atmel_serial_probe(struct platform_device *pdev) 
	if (ret)

	if (ret)

		goto err;

		goto err;





	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		goto err;

	}



	if (!atmel_use_dma_rx(&port->uart)) {

	if (!atmel_use_dma_rx(&port->uart)) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		data = kmalloc(sizeof(struct atmel_uart_char)

		data = kmalloc(sizeof(struct atmel_uart_char)

drivers/tty/serial/imx.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/pinctrl/consumer.h>

#include <linux/io.h>

#include <linux/io.h>





#include <asm/irq.h>

#include <asm/irq.h>
@@ -1507,7 +1506,6 @@ static int serial_imx_probe(struct platform_device *pdev) 
	void __iomem *base;

	void __iomem *base;

	int ret = 0;

	int ret = 0;

	struct resource *res;

	struct resource *res;

	struct pinctrl *pinctrl;





	sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL);

	sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL);

	if (!sport)

	if (!sport)
@@ -1543,13 +1541,6 @@ static int serial_imx_probe(struct platform_device *pdev) 
	sport->timer.function = imx_timeout;

	sport->timer.function = imx_timeout;

	sport->timer.data     = (unsigned long)sport;

	sport->timer.data     = (unsigned long)sport;





	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		dev_err(&pdev->dev, "failed to get default pinctrl: %d\n", ret);

		return ret;

	}



	sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg");

	sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg");

	if (IS_ERR(sport->clk_ipg)) {

	if (IS_ERR(sport->clk_ipg)) {

		ret = PTR_ERR(sport->clk_ipg);

		ret = PTR_ERR(sport->clk_ipg);

drivers/tty/serial/mxs-auart.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/pinctrl/consumer.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/dmaengine.h>
@@ -1015,7 +1014,6 @@ static int mxs_auart_probe(struct platform_device *pdev) 
	u32 version;

	u32 version;

	int ret = 0;

	int ret = 0;

	struct resource *r;

	struct resource *r;

	struct pinctrl *pinctrl;





	s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);

	s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);

	if (!s) {

	if (!s) {
@@ -1029,12 +1027,6 @@ static int mxs_auart_probe(struct platform_device *pdev) 
	else if (ret < 0)

	else if (ret < 0)

		goto out_free;

		goto out_free;





	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		goto out_free;

	}



	if (of_id) {

	if (of_id) {

		pdev->id_entry = of_id->data;

		pdev->id_entry = of_id->data;

		s->devtype = pdev->id_entry->driver_data;

		s->devtype = pdev->id_entry->driver_data;

drivers/tty/serial/omap-serial.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_data/serial-omap.h>

#include <linux/platform_data/serial-omap.h>





#define OMAP_MAX_HSUART_PORTS	6

#define OMAP_MAX_HSUART_PORTS	6
@@ -160,7 +159,6 @@ struct uart_omap_port { 
	u32			latency;

	u32			latency;

	u32			calc_latency;

	u32			calc_latency;

	struct work_struct	qos_work;

	struct work_struct	qos_work;

	struct pinctrl		*pins;

	bool			is_suspending;

	bool			is_suspending;

};

};
@@ -1468,13 +1466,6 @@ static int serial_omap_probe(struct platform_device *pdev) 
		goto err_port_line;

		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);

	sprintf(up->name, "OMAP UART%d", up->port.line);

	up->port.mapbase = mem->start;

	up->port.mapbase = mem->start;

	up->port.membase = devm_ioremap(&pdev->dev, mem->start,

	up->port.membase = devm_ioremap(&pdev->dev, mem->start,