summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-10-03 11:49:16 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-10-03 11:49:16 +0000
commit0df8963d1d22245415aa6c959400e0ed10fbe012 (patch)
tree4d95ccce6c1f350adff1e1e3db0f8b3c991f823f /drivers
parent8d95527e3887e226935ab7cb1a61d570b6468373 (diff)
More format string fixes from Maciej.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/dz.c4
-rw-r--r--drivers/tc/zs.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/dz.c b/drivers/char/dz.c
index bf4b20e79..8302f9df6 100644
--- a/drivers/char/dz.c
+++ b/drivers/char/dz.c
@@ -1047,7 +1047,7 @@ static void dz_close (struct tty_struct *tty, struct file *filp)
}
if (--info->count < 0) {
- printk("ds_close: bad serial port count for ttys%d: %d\n",
+ printk("ds_close: bad serial port count for ttyS%02d: %d\n",
info->line, info->count);
info->count = 0;
}
@@ -1379,7 +1379,7 @@ int __init dz_init(void)
if (! info->port)
return 0;
- printk("ttyS%02d at 0x%04x (irq = %d)\n", info->line, info->port, SERIAL);
+ printk("ttyS%02d at 0x%08x (irq = %d)\n", info->line, info->port, SERIAL);
}
/* reset the chip */
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 08a94fce7..21e4df264 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -623,7 +623,7 @@ static int startup(struct dec_serial * info)
save_flags(flags); cli();
#ifdef SERIAL_DEBUG_OPEN
- printk("starting up ttyS%d (irq %d)...", info->line, info->irq);
+ printk("starting up ttyS%02d (irq %d)...", info->line, info->irq);
#endif
/*
@@ -1258,7 +1258,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
}
#ifdef SERIAL_DEBUG_OPEN
- printk("rs_close ttys%d, count = %d\n", info->line, info->count);
+ printk("rs_close ttyS%02d, count = %d\n", info->line, info->count);
#endif
if ((tty->count == 1) && (info->count != 1)) {
/*
@@ -1273,7 +1273,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
info->count = 1;
}
if (--info->count < 0) {
- printk("rs_close: bad serial port count for ttys%d: %d\n",
+ printk("rs_close: bad serial port count for ttyS%02d: %d\n",
info->line, info->count);
info->count = 0;
}
@@ -1463,7 +1463,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
retval = 0;
add_wait_queue(&info->open_wait, &wait);
#ifdef SERIAL_DEBUG_OPEN
- printk("block_til_ready before block: ttys%d, count = %d\n",
+ printk("block_til_ready before block: ttyS%02d, count = %d\n",
info->line, info->count);
#endif
cli();
@@ -1499,7 +1499,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
break;
}
#ifdef SERIAL_DEBUG_OPEN
- printk("block_til_ready blocking: ttys%d, count = %d\n",
+ printk("block_til_ready blocking: ttyS%02d, count = %d\n",
info->line, info->count);
#endif
schedule();
@@ -1510,7 +1510,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
info->count++;
info->blocked_open--;
#ifdef SERIAL_DEBUG_OPEN
- printk("block_til_ready after blocking: ttys%d, count = %d\n",
+ printk("block_til_ready after blocking: ttyS%02d, count = %d\n",
info->line, info->count);
#endif
if (retval)
@@ -1600,7 +1600,7 @@ int rs_open(struct tty_struct *tty, struct file * filp)
info->pgrp = current->pgrp;
#ifdef SERIAL_DEBUG_OPEN
- printk("rs_open ttys%d successful...", info->line);
+ printk("rs_open ttyS%02d successful...", info->line);
#endif
/* tty->low_latency = 1; */
return 0;
@@ -1817,7 +1817,7 @@ int __init zs_init(void)
info->normal_termios = serial_driver.init_termios;
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
- printk("tty%02d at 0x%08x (irq = %d)", info->line,
+ printk("ttyS%02d at 0x%08x (irq = %d)", info->line,
info->port, info->irq);
printk(" is a Z85C30 SCC\n");
}