serial: mxs-auart: Remove serial_mxs_probe_dt()
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/2 serial: mxs-auart: Remove serial_mxs_probe_dt()
The mxs platform is devicetree-only, so there is no need to check whether it was instantiated via devicetree.
Simplify the code my removing serial_mxs_probe_dt() and add its content into the main probe function.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/tty/serial/mxs-auart.c | 43 +++++++++------------------------- 1 file changed, 11 insertions(+), 32 deletions(-)
drivers/tty/serial/mxs-auart.c +11 -32
@@ -1535,34 +1535,6 @@ static int mxs_get_clks(struct mxs_auart_port *s,return err; } -/* -* This function returns 1 if pdev isn't a device instatiated by dt, 0 if it -* could successfully get all information from dt or a negative errno. -*/ -static int serial_mxs_probe_dt (struct mxs_auart_port *s, -struct platform_device *pdev) -{ -struct device_node *np = pdev->dev.of_node; -int ret; - -if (!np) -/* no device tree device */ -return 1 ; - - ret =of_alias_get_id (np,"serial" ); -if (ret <0 ) { -dev_err (&pdev->dev,"failed to get alias id: %d\n" , ret); -return ret; - } - s->port.line = ret; - -if (of_get_property (np,"uart-has-rtscts" ,NULL ) || -of_get_property (np,"fsl,uart-has-rtscts" ,NULL )/* deprecated */ ) -set_bit (MXS_AUART_RTSCTS , &s->flags); - -return 0 ; -} -static int mxs_auart_init_gpios (struct mxs_auart_port *s,struct device *dev) {enum mctrl_gpio_idx i;
@@ -1631,6 +1603,7 @@ static int mxs_auart_request_gpio_irq(struct mxs_auart_port *s)static int mxs_auart_probe (struct platform_device *pdev) { +struct device_node *np = pdev->dev.of_node;struct mxs_auart_port *s;u32 version;int ret, irq;
@@ -1643,11 +1616,17 @@ static int mxs_auart_probe(struct platform_device *pdev) s->port.dev = &pdev->dev; s->dev = &pdev->dev; - ret =serial_mxs_probe_dt (s, pdev); -if (ret >0 ) - s->port.line = pdev->id <0 ?0 : pdev->id; -else if (ret <0 ) + ret =of_alias_get_id (np,"serial" ); +if (ret <0 ) { +dev_err (&pdev->dev,"failed to get alias id: %d\n" , ret);return ret; + } + s->port.line = ret; + +if (of_get_property (np,"uart-has-rtscts" ,NULL ) || +of_get_property (np,"fsl,uart-has-rtscts" ,NULL )/* deprecated */ ) +set_bit (MXS_AUART_RTSCTS , &s->flags); +if (s->port.line >=ARRAY_SIZE (auart_port)) {dev_err (&pdev->dev,"serial%d out of range\n" , s->port.line);return -EINVAL ;
Signature · 1 line
2.17.1
Fabio Estevam
reviewerPATCH 2/2 serial: mxs-auart: Remove <asm/cacheflush.h>
There is nothing in the driver that uses the definitions from <asm/cacheflush.h>.
Remove the unused header file inclusion.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/tty/serial/mxs-auart.c | 2 -- 1 file changed, 2 deletions(-)
drivers/tty/serial/mxs-auart.c +0 -2
@@ -34,8 +34,6 @@#include <linux/dma-mapping.h> #include <linux/dmaengine.h> -#include <asm/cacheflush.h> -#include <linux/gpio/consumer.h> #include <linux/err.h> #include <linux/irq.h>
Signature · 1 line
2.17.1