lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

8250_hp300: coding style

Browse Source 
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox
2008-02-08 04:18:50 -08:00
committed by Linus Torvalds
parent 8b4a483be5
commit 0fe1c13713
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/serial/8250_hp300.c
View File

@@ -36,7 +36,7 @@ static struct hp300_port *hp300_ports;
#ifdef CONFIG_HPDCA #ifdef CONFIG_HPDCA
static int __devinit hpdca_init_one(struct dio_dev *d, static int __devinit hpdca_init_one(struct dio_dev *d,
const struct dio_device_id *ent); const struct dio_device_id *ent);
static void __devexit hpdca_remove_one(struct dio_dev *d); static void __devexit hpdca_remove_one(struct dio_dev *d);
static struct dio_device_id hpdca_dio_tbl[] = { static struct dio_device_id hpdca_dio_tbl[] = {
@@ -85,7 +85,7 @@ extern int hp300_uart_scode;
#ifdef CONFIG_SERIAL_8250_CONSOLE #ifdef CONFIG_SERIAL_8250_CONSOLE
/* /*
* Parse the bootinfo to find descriptions for headless console and * Parse the bootinfo to find descriptions for headless console and
* debug serial ports and register them with the 8250 driver. * debug serial ports and register them with the 8250 driver.
* This function should be called before serial_console_init() is called * This function should be called before serial_console_init() is called
* to make sure the serial console will be available for use. IA-64 kernel * to make sure the serial console will be available for use. IA-64 kernel
@@ -126,13 +126,11 @@ int __init hp300_setup_serial_console(void)
printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n"); printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n");
return 0; return 0;
#endif #endif
} } else {
else {
#ifdef CONFIG_HPDCA #ifdef CONFIG_HPDCA
unsigned long pa = dio_scodetophysaddr(scode); unsigned long pa = dio_scodetophysaddr(scode);
if (!pa) { if (!pa)
return 0; return 0;
}
printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode); printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode);
@@ -145,26 +143,23 @@ int __init hp300_setup_serial_console(void)
/* Enable board-interrupts */ /* Enable board-interrupts */
out_8(pa + DIO_VIRADDRBASE + DCA_IC, DCA_IC_IE); out_8(pa + DIO_VIRADDRBASE + DCA_IC, DCA_IC_IE);
if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80) { if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80)
add_preferred_console("ttyS", port.line, "9600n8"); add_preferred_console("ttyS", port.line, "9600n8");
}
#else #else
printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n"); printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n");
return 0; return 0;
#endif #endif
} }
if (early_serial_setup(&port) < 0) { if (early_serial_setup(&port) < 0)
printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n"); printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n");
}
return 0; return 0;
} }
#endif /* CONFIG_SERIAL_8250_CONSOLE */ #endif /* CONFIG_SERIAL_8250_CONSOLE */
#ifdef CONFIG_HPDCA #ifdef CONFIG_HPDCA
static int __devinit hpdca_init_one(struct dio_dev *d, static int __devinit hpdca_init_one(struct dio_dev *d,
const struct dio_device_id *ent) const struct dio_device_id *ent)
{ {
struct uart_port port; struct uart_port port;
int line; int line;
@@ -210,7 +205,7 @@ static int __devinit hpdca_init_one(struct dio_dev *d,
static int __init hp300_8250_init(void) static int __init hp300_8250_init(void)
{ {
static int called = 0; static int called;
#ifdef CONFIG_HPAPCI #ifdef CONFIG_HPAPCI
int line; int line;
unsigned long base; unsigned long base;
@@ -239,13 +234,12 @@ static int __init hp300_8250_init(void)
* Port 1 is either the console or the DCA. * Port 1 is either the console or the DCA.
*/ */
for (i = 1; i < 4; i++) { for (i = 1; i < 4; i++) {
/* Port 1 is the console on a 425e, on other machines it's mapped to /* Port 1 is the console on a 425e, on other machines it's
* DCA. * mapped to DCA.
*/ */
#ifdef CONFIG_SERIAL_8250_CONSOLE #ifdef CONFIG_SERIAL_8250_CONSOLE
if (i == 1) { if (i == 1)
continue; continue;
}
#endif #endif
/* Create new serial device */ /* Create new serial device */
@@ -259,7 +253,8 @@ static int __init hp300_8250_init(void)
/* Memory mapped I/O */ /* Memory mapped I/O */
uport.iotype = UPIO_MEM; uport.iotype = UPIO_MEM;
uport.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF; uport.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ \
| UPF_BOOT_AUTOCONF;
/* XXX - no interrupt support yet */ /* XXX - no interrupt support yet */
uport.irq = 0; uport.irq = 0;
uport.uartclk = HPAPCI_BAUD_BASE * 16; uport.uartclk = HPAPCI_BAUD_BASE * 16;
@@ -270,8 +265,8 @@ static int __init hp300_8250_init(void)
line = serial8250_register_port(&uport); line = serial8250_register_port(&uport);
if (line < 0) { if (line < 0) {
printk(KERN_NOTICE "8250_hp300: register_serial() APCI %d" printk(KERN_NOTICE "8250_hp300: register_serial() APCI"
" irq %d failed\n", i, uport.irq); " %d irq %d failed\n", i, uport.irq);
kfree(port); kfree(port);
continue; continue;
} }