openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <festevam@gmail.com>
Link: https://lore.kernel.org/r/20210118152154.1644569-1-festevam@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Fabio Estevam 2021-01-18 12:21:53 -03:00 committed by Greg Kroah-Hartman
parent e8372c4f51
commit 08fdc69945
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/tty/serial/mxs-auart.c
View File

@ -1535,34 +1535,6 @@ static int mxs_get_clks(struct mxs_auart_port *s,
return err; 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) static int mxs_auart_init_gpios(struct mxs_auart_port *s, struct device *dev)
{ {
enum mctrl_gpio_idx i; 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) static int mxs_auart_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node;
struct mxs_auart_port *s; struct mxs_auart_port *s;
u32 version; u32 version;
int ret, irq; int ret, irq;
@ -1643,11 +1616,17 @@ static int mxs_auart_probe(struct platform_device *pdev)
s->port.dev = &pdev->dev; s->port.dev = &pdev->dev;
s->dev = &pdev->dev; s->dev = &pdev->dev;
ret = serial_mxs_probe_dt(s, pdev); ret = of_alias_get_id(np, "serial");
if (ret > 0) if (ret < 0) {
s->port.line = pdev->id < 0 ? 0 : pdev->id; dev_err(&pdev->dev, "failed to get alias id: %d\n", ret);
else if (ret < 0)
return 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)) { if (s->port.line >= ARRAY_SIZE(auart_port)) {
dev_err(&pdev->dev, "serial%d out of range\n", s->port.line); dev_err(&pdev->dev, "serial%d out of range\n", s->port.line);
return -EINVAL; return -EINVAL;