Messages in this thread | | | Date | Fri, 28 Oct 2011 14:38:09 +0200 | From | Nicolas Ferre <> | Subject | Re: [PATCH] tty/serial: atmel_serial: fix compilation |
| |
On 10/28/2011 01:33 PM, Sven Schnelle : > If CONFIG_OF is disabled, compilation fails with: > > drivers/tty/serial/atmel_serial.c: In function 'atmel_serial_probe': > drivers/tty/serial/atmel_serial.c:1788: error: implicit declaration of function 'of_alias_get_id' > > Fix this by adding the proper CONFIG_OF checks.
Yes, but I would like to avoid this and I have made a patch to address this issue. I have sent it to the device tree guys yesterday: "[PATCH] dt: add empty of_alias_get_id() for non-dt builds"
Maybe we can wait a little and see if it reaches Linus' tree on time. If it is not, I will make sure that such a fix make it to mainline.
Best regards,
> Signed-off-by: Sven Schnelle <svens@stackframe.org> > --- > drivers/tty/serial/atmel_serial.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c > index 4a0f86f..de338dd 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -1777,16 +1777,20 @@ static int atmel_serial_resume(struct platform_device *pdev) > static int __devinit atmel_serial_probe(struct platform_device *pdev) > { > struct atmel_uart_port *port; > +#ifdef CONFIG_OF > struct device_node *np = pdev->dev.of_node; > +#endif > struct atmel_uart_data *pdata = pdev->dev.platform_data; > void *data; > int ret = -ENODEV; > > BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1)); > > +#ifdef CONFIG_OF > if (np) > ret = of_alias_get_id(np, "serial"); > else > +#endif > if (pdata) > ret = pdata->num; >
-- Nicolas Ferre
| |