Merge tag 'rproc-v4.9' of git://github.com/andersson/remoteproc

[cascardo/linux.git] / drivers / scsi / wd7000.c

diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index 0c0f17b..409f959 100644 (file)
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -192,7 +192,7 @@
 #ifdef WD7000_DEBUG
 #define dprintk printk
 #else
-#define dprintk(format,args...)
+#define dprintk        no_printk
 #endif
 
 /*
@@ -1591,8 +1591,8 @@ static int wd7000_biosparam(struct scsi_device *sdev,
 {
        char b[BDEVNAME_SIZE];
 
-       dprintk("wd7000_biosparam: dev=%s, size=%d, ",
-               bdevname(bdev, b), capacity);
+       dprintk("wd7000_biosparam: dev=%s, size=%llu, ",
+               bdevname(bdev, b), (u64)capacity);
        (void)b;        /* unused var warning? */
 
        /*