Signed-off-by: Alan Cox <[EMAIL PROTECTED]>
Coding style tweaks and printk levels
diff -u --new-file --recursive --exclude-from /usr/src/exclude
linux.vanilla-2.6.24-rc6-mm1/drivers/serial/8250.c
linux-2.6.24-rc6-mm1/drivers/serial/8250.c
--- linux.vanilla-2.6.24-rc6-mm1/drivers/serial/8250.c 2008-01-02
16:04:23.000000000 +0000
+++ linux-2.6.24-rc6-mm1/drivers/serial/8250.c 2008-01-02 16:17:50.000000000
+0000
@@ -2048,7 +2048,7 @@
* Oxford Semi 952 rev B workaround
*/
if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
- quot ++;
+ quot++;
if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
if (baud < 2400)
diff -u --new-file --recursive --exclude-from /usr/src/exclude
linux.vanilla-2.6.24-rc6-mm1/drivers/serial/8250_pnp.c
linux-2.6.24-rc6-mm1/drivers/serial/8250_pnp.c
--- linux.vanilla-2.6.24-rc6-mm1/drivers/serial/8250_pnp.c 2008-01-02
16:04:05.000000000 +0000
+++ linux-2.6.24-rc6-mm1/drivers/serial/8250_pnp.c 2008-01-02
16:17:50.000000000 +0000
@@ -414,8 +414,9 @@
*/
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))))
- return -ENODEV;
+ if (!(check_name(pnp_dev_name(dev)) ||
+ (dev->card && check_name(dev->card->name))))
+ return -ENODEV;
if (check_resources(dev->independent))
return 0;
@@ -452,8 +453,9 @@
return -ENODEV;
#ifdef SERIAL_DEBUG_PNP
- printk("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
- port.iobase, port.mapbase, port.irq, port.iotype);
+ printk(KERN_DEBUG
+ "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
+ port.iobase, port.mapbase, port.irq, port.iotype);
#endif
port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
