Commit 0fe1c137 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

8250_hp300: coding style 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8b4a483b

drivers/serial/8250_hp300.c

+15 −20
Original line number Diff line number Diff line
@@ -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");

		return 0;

#endif

	}

	else {

	} else {

#ifdef CONFIG_HPDCA

		unsigned long pa = dio_scodetophysaddr(scode);

		if (!pa) {

		if (!pa)

			return 0;

		}



		printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode);
@@ -145,19 +143,16 @@ int __init hp300_setup_serial_console(void) 
		/* Enable board-interrupts */

		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");

		}

#else

		printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n");

		return 0;

#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");

	}



	return 0;

}

#endif /* CONFIG_SERIAL_8250_CONSOLE */
@@ -210,7 +205,7 @@ static int __devinit hpdca_init_one(struct dio_dev *d, 


static int __init hp300_8250_init(void)

{

	static int called = 0;

	static int called;

#ifdef CONFIG_HPAPCI

	int line;

	unsigned long base;
@@ -239,13 +234,12 @@ static int __init hp300_8250_init(void) 
	 * Port 1 is either the console or the DCA.

	 */

	for (i = 1; i < 4; i++) {

		/* Port 1 is the console on a 425e, on other machines it's mapped to

		 * DCA.

		/* Port 1 is the console on a 425e, on other machines it's

		 * mapped to DCA.

		 */

#ifdef CONFIG_SERIAL_8250_CONSOLE

		if (i == 1) {

		if (i == 1)

			continue;

		}

#endif



		/* Create new serial device */
@@ -259,7 +253,8 @@ static int __init hp300_8250_init(void) 


		/* Memory mapped I/O */

		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 */

		uport.irq = 0;

		uport.uartclk = HPAPCI_BAUD_BASE * 16;
@@ -270,8 +265,8 @@ static int __init hp300_8250_init(void) 
		line = serial8250_register_port(&uport);



		if (line < 0) {

			printk(KERN_NOTICE "8250_hp300: register_serial() APCI %d"

			       " irq %d failed\n", i, uport.irq);

			printk(KERN_NOTICE "8250_hp300: register_serial() APCI"

			       " %d irq %d failed\n", i, uport.irq);

			kfree(port);

			continue;

		}