Commit 40e4c0a4 authored Jun 21, 2016 by Arnd Bergmann Committed by Martin K. Petersen Jul 12, 2016

scsi: wd7000: print sector number as 64-bit



Enabling format checking in dprintk() shows that wd7000_biosparam uses
an incorrect format string for sector_t:

drivers/scsi/wd7000.c: In function 'wd7000_biosparam':
drivers/scsi/wd7000.c:1594:21: error: format '%d' expects argument of type 'int', but argument 3 has type 'sector_t {aka long long unsigned int}' [-Werror=format=]

As sector_t can be 32-bit wide, this adds a cast to 'u64' and prints
that with the correct format. The change to use no_printk() generally
helps with finding this kind of hidden format string bug, and I found
that when building with "-Wextra", which warned about an empty else
clause in

       } else
              dprintk("ok!\n");

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 540eb1ee

drivers/scsi/wd7000.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -192,7 +192,7 @@
	#ifdef WD7000_DEBUG		#ifdef WD7000_DEBUG
	#define dprintk printk		#define dprintk printk
	#else		#else
	#define dprintk(format,args...)		#define dprintk no_printk
	#endif		#endif

	/*		/*
	@@ -1591,8 +1591,8 @@ static int wd7000_biosparam(struct scsi_device *sdev,
	{		{
	char b[BDEVNAME_SIZE];		char b[BDEVNAME_SIZE];

	dprintk("wd7000_biosparam: dev=%s, size=%d, ",		dprintk("wd7000_biosparam: dev=%s, size=%llu, ",
	bdevname(bdev, b), capacity);		bdevname(bdev, b), (u64)capacity);
	(void)b; /* unused var warning? */		(void)b; /* unused var warning? */

	/*		/*

Admin message