Skip to contentSkip to conversation

scsi: fix u14-34f printk format warnings

PATCH In review Randy Dunlap 3 participants 4 messages Jul 24, 2014 – Aug 1, 2014 SCSI

lore
Share & tools
lore

Randy Dunlap

author
#0 lore raw

PATCH 1/1 scsi: fix u14-34f printk format warnings

From: Randy Dunlap <[email protected]>

Fix printk format warnings (seen on i386 builds):

../drivers/scsi/u14-34f.c: In function 'port_detect':
../drivers/scsi/u14-34f.c:630:28: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'u64' [-Wformat=] ../drivers/scsi/u14-34f.c: In function 'u14_34f_queuecommand_lck':
../drivers/scsi/u14-34f.c:1290:25: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type 'int' [-Wformat=]

Signed-off-by Randy Dunlap <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 drivers/scsi/u14-34f.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/u14-34f.c +2 -2
Index: linux-next-20140724/drivers/scsi/u14-34f.c
===================================================================
@@ -1006,7 +1006,7 @@ static int port_detect \
           sh[j]->irq, dma_name, sh[j]->sg_tablesize, sh[j]->can_queue);
 
    if (sh[j]->max_id > 8 || sh[j]->max_lun > 8)
-      printk("%s: wide SCSI support enabled, max_id %u, max_lun %u.\n",
+      printk("%s: wide SCSI support enabled, max_id %u, max_lun %llu.\n",
              BN(j), sh[j]->max_id, sh[j]->max_lun);
 
    for (i = 0; i <= sh[j]->max_channel; i++)

@@ -1285,7 +1285,7 @@ static int u14_34f_queuecommand_lck(stru
    cpp->cpp_index = i;
    SCpnt->host_scribble = (unsigned char *) &cpp->cpp_index;
 
-   if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%llu.\n",
+   if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%u.\n",
                         BN(j), i, SCpnt->device->channel, SCpnt->device->id,
                         (u8)SCpnt->device->lun);
author
#1 lore raw

any comments?

Thanks.

Quoted 39 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix printk format warnings (seen on i386 builds):

../drivers/scsi/u14-34f.c: In function 'port_detect':
../drivers/scsi/u14-34f.c:630:28: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'u64' [-Wformat=] ../drivers/scsi/u14-34f.c: In function 'u14_34f_queuecommand_lck':
../drivers/scsi/u14-34f.c:1290:25: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type 'int' [-Wformat=]

Signed-off-by Randy Dunlap <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 drivers/scsi/u14-34f.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-next-20140724/drivers/scsi/u14-34f.c
===================================================================

drivers/scsi/u14-34f.c +2 -3
@@ -1006,7 +1006,7 @@ static int port_detect \
           sh[j]->irq, dma_name, sh[j]->sg_tablesize, sh[j]->can_queue);
 
    if (sh[j]->max_id > 8 || sh[j]->max_lun > 8)
-      printk("%s: wide SCSI support enabled, max_id %u, max_lun %u.\n",
+      printk("%s: wide SCSI support enabled, max_id %u, max_lun %llu.\n",
              BN(j), sh[j]->max_id, sh[j]->max_lun);
 
    for (i = 0; i <= sh[j]->max_channel; i++)

@@ -1285,7 +1285,7 @@ static int u14_34f_queuecommand_lck(stru
    cpp->cpp_index = i;
    SCpnt->host_scribble = (unsigned char *) &cpp->cpp_index;
 
-   if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%llu.\n",
+   if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%u.\n",
                         BN(j), i, SCpnt->device->channel, SCpnt->device->id,
                         (u8)SCpnt->device->lun);
 
--
Signature · 1 line
~Randy
#2 lore raw

Thanks, Randy.

I'll merge it. I usually want a second review for scsi patches, but I guess this one is trivial enough to waive that requirement.

That being said is anyone still using the u14-34f driver? From looking at the commit history it doesn't really look either maintained or used..

Reviewed-by
#3 lore raw
In reply to Randy Dunlap
Quoted 38 lines · Randy Dunlap

any comments?

Thanks.

Quoted 33 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix printk format warnings (seen on i386 builds):

../drivers/scsi/u14-34f.c: In function 'port_detect':
../drivers/scsi/u14-34f.c:630:28: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'u64' [-Wformat=] ../drivers/scsi/u14-34f.c: In function 'u14_34f_queuecommand_lck':
../drivers/scsi/u14-34f.c:1290:25: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type 'int' [-Wformat=]

Signed-off-by Randy Dunlap <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
  drivers/scsi/u14-34f.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-next-20140724/drivers/scsi/u14-34f.c
===================================================================

drivers/scsi/u14-34f.c +1 -1
@@ -1006,7 +1006,7 @@ static int port_detect \
            sh[j]->irq, dma_name, sh[j]->sg_tablesize, sh[j]->can_queue);
 
     if (sh[j]->max_id > 8 || sh[j]->max_lun > 8)
-      printk("%s: wide SCSI support enabled, max_id %u, max_lun %u.\n",
+      printk("%s: wide SCSI support enabled, max_id %u, max_lun %llu.\n",
               BN(j), sh[j]->max_id, sh[j]->max_lun);
 
     for (i = 0; i <= sh[j]->max_channel; i++)

@@ -1285,7 +1285,7 @@ static int u14_34f_queuecommand_lck(stru
     cpp->cpp_index = i;
     SCpnt->host_scribble = (unsigned char *) &cpp->cpp_index;
Quoted 8 lines

drivers/scsi/u14-34f.c static int u14_34f_queuecommand_lck(stru

Quoted 6 lines
drivers/scsi/u14-34f.c +1 -2
-   if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%llu.\n",
+   if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%u.\n",
                          BN(j), i, SCpnt->device->channel, SCpnt->device->id,
                          (u8)SCpnt->device->lun);
 
--
Reviewed-by Hannes Reinecke <[email protected]>

Cheers,

Hannes

Signature · 8 lines
Dr. Hannes Reinecke		      zSeries & Storage
[email protected]			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html