[PATCH] ppchameleon_early_serial_map hidden under #ifdef CONFIG_SERIAL_8250

Igor Marnat marny at rambler.ru
Tue Apr 10 17:31:57 EST 2007


>> GL> This is just ugly, but not because of your patch.  External function
>> GL> prototypes that aren't pulled from header files can lead to all kinds
>> GL> of wierdness.  Since the code is already ugly and dangerous, I
>> GL> wouldn't even bother with adding the #ifdef around it.

I changed the patch as you recommended. You were correct, external
declarations are of no use there. At least kernel gets built
successfully both with and without CONFIG_SERIAL_8250 with the patch
applied. Hope it will suit better.

Author: Igor Marnat <marny at rambler.ru>
Date:   Tue Apr 10 11:16:35 2007 +0400

    ppchameleon_early_serial_map hidden under #ifdef CONFIG_SERIAL_8250,
    "extern void gen550_init" and  "extern int early_serial_setup" declarations removed
    since they are already included in header files

    Signed-off-by: Igor Marnat <marny at rambler.ru>

diff --git a/arch/ppc/platforms/4xx/ppchameleon.c b/arch/ppc/platforms/4xx/ppchameleon.c
index 6d8b7ad..f3cf7ec 100644
--- a/arch/ppc/platforms/4xx/ppchameleon.c
+++ b/arch/ppc/platforms/4xx/ppchameleon.c
@@ -44,9 +44,6 @@

 void *ppchameleon_rtc_base;

-extern void gen550_init(int, struct uart_port *);
-extern int early_serial_setup(struct uart_port *port);
 /* Some IRQs unique to the board
  * Used by the generic 405 PCI setup functions in ppc4xx_pci.c
@@ -75,6 +72,7 @@ ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
  * Calculate the proper input baud rate and setup the serial driver.

+#ifdef CONFIG_SERIAL_8250
 static void __init
 ppchameleon_early_serial_map (void)
@@ -105,7 +103,9 @@ ppchameleon_early_serial_map (void)
                printk ("Early serial init of port 0 failed\n");
+#else /* CONFIG_SERIAL_8250 */
+#define ppchameleon_early_serial_map()
+#endif /* CONFIG_SERIAL_8250 */

 void __init board_setup_arch (void)

Best regards,
Igor Marnat
mailto:marny at rambler.ru

More information about the Linuxppc-dev mailing list