serial: Coding style

Coding style tweaks and printk levels.

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-04 22:27:53 -08:00 committed by Linus Torvalds
parent 6d4d67beb9
commit 3e8d4e2075
2 changed files with 7 additions and 5 deletions

View file

@ -2047,7 +2047,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
* Oxford Semi 952 rev B workaround * Oxford Semi 952 rev B workaround
*/ */
if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0) if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
quot ++; quot++;
if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) { if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
if (baud < 2400) if (baud < 2400)

View file

@ -414,8 +414,9 @@ static int __devinit check_resources(struct pnp_option *option)
*/ */
static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags) static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags)
{ {
if (!(check_name(pnp_dev_name(dev)) || (dev->card && check_name(dev->card->name)))) if (!(check_name(pnp_dev_name(dev)) ||
return -ENODEV; (dev->card && check_name(dev->card->name))))
return -ENODEV;
if (check_resources(dev->independent)) if (check_resources(dev->independent))
return 0; return 0;
@ -452,8 +453,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
return -ENODEV; return -ENODEV;
#ifdef SERIAL_DEBUG_PNP #ifdef SERIAL_DEBUG_PNP
printk("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", printk(KERN_DEBUG
port.iobase, port.mapbase, port.irq, port.iotype); "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
port.iobase, port.mapbase, port.irq, port.iotype);
#endif #endif
port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF; port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;