On Mon, 2008-07-07 at 11:05 -0400, Paul Gortmaker wrote:
> Terminate the array of possible legacy serial parents, and
> choose more meaningful names for better autopsy value. Fix
> and cleanups as suggested by Benjamin Herrenschmidt.
>
> Signed-off-by: Paul Gortmaker <[EMAIL PROTECTED]>
> ---
Hi Paul !
Linus already merged my fix for legacy_serial.c, can you split
out the ibmebus part and resend it ? I'll stick it in -next.
Cheers,
Ben.
> arch/powerpc/kernel/ibmebus.c | 4 ++--
> arch/powerpc/kernel/legacy_serial.c | 5 +++--
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
> index 9971159..58da8f8 100644
> --- a/arch/powerpc/kernel/ibmebus.c
> +++ b/arch/powerpc/kernel/ibmebus.c
> @@ -53,7 +53,7 @@ static struct device ibmebus_bus_device = { /* fake
> "parent" device */
> struct bus_type ibmebus_bus_type;
>
> /* These devices will automatically be added to the bus during init */
> -static struct of_device_id __initdata builtin_matches[] = {
> +static struct of_device_id __initdata ibmebus_matches[] = {
> { .compatible = "IBM,lhca" },
> { .compatible = "IBM,lhea" },
> {},
> @@ -350,7 +350,7 @@ static int __init ibmebus_bus_init(void)
> return err;
> }
>
> - err = ibmebus_create_devices(builtin_matches);
> + err = ibmebus_create_devices(ibmebus_matches);
> if (err) {
> device_unregister(&ibmebus_bus_device);
> bus_unregister(&ibmebus_bus_type);
> diff --git a/arch/powerpc/kernel/legacy_serial.c
> b/arch/powerpc/kernel/legacy_serial.c
> index 61dd174..4b01c2b 100644
> --- a/arch/powerpc/kernel/legacy_serial.c
> +++ b/arch/powerpc/kernel/legacy_serial.c
> @@ -33,13 +33,14 @@ static struct legacy_serial_info {
> phys_addr_t taddr;
> } legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS];
>
> -static struct __initdata of_device_id parents[] = {
> +static struct __initdata of_device_id uart_match[] = {
> {.type = "soc",},
> {.type = "tsi-bridge",},
> {.type = "opb", },
> {.compatible = "ibm,opb",},
> {.compatible = "simple-bus",},
> {.compatible = "wrs,epld-localbus",},
> + {},
> };
>
> static unsigned int legacy_serial_count;
> @@ -322,7 +323,7 @@ void __init find_legacy_serial_ports(void)
> struct device_node *parent = of_get_parent(np);
> if (!parent)
> continue;
> - if (of_match_node(parents, parent) != NULL) {
> + if (of_match_node(uart_match, parent) != NULL) {
> index = add_legacy_soc_port(np, np);
> if (index >= 0 && np == stdout)
> legacy_serial_console = index;
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
