* [PATCH 1/2] serial: imx: Let device core handle pinctrl
@ 2013-05-27 1:43 Fabio Estevam
2013-05-27 1:43 ` [PATCH 2/2] serial: mxs-auart: " Fabio Estevam
2013-05-27 7:15 ` [PATCH 1/2] serial: imx: " Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2013-05-27 1:43 UTC (permalink / raw)
To: gregkh; +Cc: shawn.guo, kernel, linux-serial, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
Since commit ab78029 (drivers/pinctrl: grab default handles from device core)
we can rely on device core for handling pinctrl, so remove
devm_pinctrl_get_select_default() from the driver.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/tty/serial/imx.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 72bc1db..2ea3494 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -47,7 +47,6 @@
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/io.h>
#include <asm/irq.h>
@@ -1481,7 +1480,6 @@ static int serial_imx_probe(struct platform_device *pdev)
void __iomem *base;
int ret = 0;
struct resource *res;
- struct pinctrl *pinctrl;
sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL);
if (!sport)
@@ -1517,13 +1515,6 @@ static int serial_imx_probe(struct platform_device *pdev)
sport->timer.function = imx_timeout;
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");
if (IS_ERR(sport->clk_ipg)) {
ret = PTR_ERR(sport->clk_ipg);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] serial: mxs-auart: Let device core handle pinctrl
2013-05-27 1:43 [PATCH 1/2] serial: imx: Let device core handle pinctrl Fabio Estevam
@ 2013-05-27 1:43 ` Fabio Estevam
2013-05-27 7:15 ` [PATCH 1/2] serial: imx: " Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2013-05-27 1:43 UTC (permalink / raw)
To: gregkh; +Cc: shawn.guo, kernel, linux-serial, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
Since commit ab78029 (drivers/pinctrl: grab default handles from device core)
we can rely on device core for handling pinctrl, so remove
devm_pinctrl_get_select_default() from the driver.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/tty/serial/mxs-auart.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 4f5f161..a63a20e 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -32,7 +32,6 @@
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/io.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/of_device.h>
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
@@ -1015,7 +1014,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
u32 version;
int ret = 0;
struct resource *r;
- struct pinctrl *pinctrl;
s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);
if (!s) {
@@ -1029,12 +1027,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
else if (ret < 0)
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) {
pdev->id_entry = of_id->data;
s->devtype = pdev->id_entry->driver_data;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] serial: imx: Let device core handle pinctrl
2013-05-27 1:43 [PATCH 1/2] serial: imx: Let device core handle pinctrl Fabio Estevam
2013-05-27 1:43 ` [PATCH 2/2] serial: mxs-auart: " Fabio Estevam
@ 2013-05-27 7:15 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2013-05-27 7:15 UTC (permalink / raw)
To: Fabio Estevam; +Cc: gregkh, kernel, linux-serial, Fabio Estevam
On Sun, May 26, 2013 at 10:43:04PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Since commit ab78029 (drivers/pinctrl: grab default handles from device core)
> we can rely on device core for handling pinctrl, so remove
> devm_pinctrl_get_select_default() from the driver.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Both,
Acked-by: Shawn Guo <shawn.guo@linaro.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-27 7:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-27 1:43 [PATCH 1/2] serial: imx: Let device core handle pinctrl Fabio Estevam
2013-05-27 1:43 ` [PATCH 2/2] serial: mxs-auart: " Fabio Estevam
2013-05-27 7:15 ` [PATCH 1/2] serial: imx: " Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).