aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-02-05 01:27:53 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:10 -0500
commit3e8d4e2075e049664294722b436edfc5ced6ca53 (patch)
tree51510152392373b388bad091518f790228f18826
parent6d4d67beb963de8865499781b8523e5b683819c3 (diff)
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>
-rw-r--r--drivers/serial/8250.c2
-rw-r--r--drivers/serial/8250_pnp.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index c93ef205aa2f..b8a4bd94f51d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2047,7 +2047,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
2047 * Oxford Semi 952 rev B workaround 2047 * Oxford Semi 952 rev B workaround
2048 */ 2048 */
2049 if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0) 2049 if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
2050 quot ++; 2050 quot++;
2051 2051
2052 if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) { 2052 if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
2053 if (baud < 2400) 2053 if (baud < 2400)
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 1de098e75497..6f09cbd7fc48 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -414,8 +414,9 @@ static int __devinit check_resources(struct pnp_option *option)
414 */ 414 */
415static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags) 415static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags)
416{ 416{
417 if (!(check_name(pnp_dev_name(dev)) || (dev->card && check_name(dev->card->name)))) 417 if (!(check_name(pnp_dev_name(dev)) ||
418 return -ENODEV; 418 (dev->card && check_name(dev->card->name))))
419 return -ENODEV;
419 420
420 if (check_resources(dev->independent)) 421 if (check_resources(dev->independent))
421 return 0; 422 return 0;
@@ -452,8 +453,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
452 return -ENODEV; 453 return -ENODEV;
453 454
454#ifdef SERIAL_DEBUG_PNP 455#ifdef SERIAL_DEBUG_PNP
455 printk("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", 456 printk(KERN_DEBUG
456 port.iobase, port.mapbase, port.irq, port.iotype); 457 "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
458 port.iobase, port.mapbase, port.irq, port.iotype);
457#endif 459#endif
458 460
459 port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF; 461 port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;