summaryrefslogtreecommitdiffstats
path: root/drivers/block/paride
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2009-08-24 10:56:38 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-09-11 14:34:33 +0200
commit49b3a3cbc0311f8f809183696b1f2ab824b18a51 (patch)
tree3ec892d4cb7e8d96f9b0ec26bb7eefaa901201b0 /drivers/block/paride
parentcciss: memory leak in cciss_init_one() (diff)
downloadlinux-49b3a3cbc0311f8f809183696b1f2ab824b18a51.tar.xz
linux-49b3a3cbc0311f8f809183696b1f2ab824b18a51.zip
block: use printk_once
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Tim Waugh <tim@cyberelk.net> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/paride')
-rw-r--r--drivers/block/paride/pcd.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 911dfd98d813..9f3518c515a1 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -219,8 +219,6 @@ static int pcd_sector; /* address of next requested sector */
static int pcd_count; /* number of blocks still to do */
static char *pcd_buf; /* buffer for request in progress */
-static int pcd_warned; /* Have we logged a phase warning ? */
-
/* kernel glue structures */
static int pcd_block_open(struct block_device *bdev, fmode_t mode)
@@ -417,12 +415,10 @@ static int pcd_completion(struct pcd_unit *cd, char *buf, char *fun)
printk
("%s: %s: Unexpected phase %d, d=%d, k=%d\n",
cd->name, fun, p, d, k);
- if ((verbose < 2) && !pcd_warned) {
- pcd_warned = 1;
- printk
- ("%s: WARNING: ATAPI phase errors\n",
- cd->name);
- }
+ if (verbose < 2)
+ printk_once(
+ "%s: WARNING: ATAPI phase errors\n",
+ cd->name);
mdelay(1);
}
if (k++ > PCD_TMO) {