Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into for-linus

[pandora-kernel.git] / drivers / block / paride / pcd.c

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 911dfd9..9f3518c 100644 (file)
--- 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) {