Messages in this thread | | | From | Grant Likely <> | Date | Fri, 25 Feb 2011 12:22:37 -0700 | Subject | Re: [PATCH] tty/serial: Relax the device_type restriction from of_serial |
| |
Hi Arnd and Ben,
I forgot to cc you guys on this patch. Greg has it in his tree, but I wanted to make sure you noticed it. If you have any objections, let me know and I'll ask Greg to drop it.
Thanks, g.
On Tue, Feb 22, 2011 at 7:12 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > There is no need to test for a device_type property in ns8250 > compatible serial ports. device_type is an OpenFirmware property that > is not required when using the flattened tree representation. > > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> > --- > drivers/tty/serial/of_serial.c | 18 +++++++++--------- > 1 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c > index 5c7abe4..6a18ca6 100644 > --- a/drivers/tty/serial/of_serial.c > +++ b/drivers/tty/serial/of_serial.c > @@ -160,17 +160,17 @@ static int of_platform_serial_remove(struct platform_device *ofdev) > * A few common types, add more as needed. > */ > static struct of_device_id __devinitdata of_platform_serial_table[] = { > - { .type = "serial", .compatible = "ns8250", .data = (void *)PORT_8250, }, > - { .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, }, > - { .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, }, > - { .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, }, > - { .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, }, > - { .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, }, > + { .compatible = "ns8250", .data = (void *)PORT_8250, }, > + { .compatible = "ns16450", .data = (void *)PORT_16450, }, > + { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, > + { .compatible = "ns16550", .data = (void *)PORT_16550, }, > + { .compatible = "ns16750", .data = (void *)PORT_16750, }, > + { .compatible = "ns16850", .data = (void *)PORT_16850, }, > #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL > - { .type = "serial", .compatible = "ibm,qpace-nwp-serial", > - .data = (void *)PORT_NWPSERIAL, }, > + { .compatible = "ibm,qpace-nwp-serial", > + .data = (void *)PORT_NWPSERIAL, }, > #endif > - { .type = "serial", .data = (void *)PORT_UNKNOWN, }, > + { .type = "serial", .data = (void *)PORT_UNKNOWN, }, > { /* end of list */ }, > }; > > >
-- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |