block: use printk_once
PATCH RESEND 1/1 block: use printk_once
Signed-off-by Marcin Slusarz <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Tim Waugh <[email protected]>
drivers/block/paride/pcd.c +4 -8
@@ -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 ) {
drivers/block/sx8.c +1 -3
@@ -1564,15 +1564,13 @@ static int carm_init_shm(struct carm_host *host)static int carm_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static unsigned int printed_version;struct carm_host *host;unsigned int pci_dac;int rc;struct request_queue *q;unsigned int i; -if (!printed_version++) - printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); + printk_once(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); rc =pci_enable_device (pdev);if (rc)
drivers/block/viodasd.c +3 -9
@@ -416,15 +416,9 @@ retry: goto retry; }if (we.max_disk > (MAX_DISKNO -1 )) { -static int warned; - -if (warned ==0 ) { - warned++; -printk (VIOD_KERN_INFO -"Only examining the first %d " -"of %d disks connected\n" , -MAX_DISKNO , we.max_disk +1 ); - } +printk_once (VIOD_KERN_INFO +"Only examining the first %d of %d disks connected\n" , +MAX_DISKNO , we.max_disk +1 ); }/* Send the close event to OS/400. We DON'T expect a response */
Quoted 3 lines · Marcin Slusarz
Signed-off-by Marcin Slusarz <[email protected]>Cc Jens Axboe <[email protected]>Cc Tim Waugh <[email protected]>
Applied for 2.6.32.
Signature · 1 line
Jens Axboe