linux-next: build failure after merge of the scsi tree

[Stephen Rothwell]

Hi James,

After merging the scsi tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought to be
  ret = dev_printk(level, &sdev->sdev_gendev, "%s", logbuf);
      ^
drivers/scsi/scsi_logging.c: In function 'scmd_printk':
drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought to be
  ret = dev_printk(level, &scmd->device->sdev_gendev, "%s", logbuf);
      ^

Caused by commit ded85c193a39 ("scsi: Implement per-cpu logging
buffer") interacting with commit d1f1052c5204 ("device: Change
dev_<level> logging functions to return void") from the driver-core
tree.

I added the following merge resolution patch.  Someone will have to
remember to tell Linus.  Also, the void return may be able to be
propagated further up the chain since these two new affected functions
now always return 0.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 4 Feb 2015 17:18:08 +1100
Subject: [PATCH] scsi: merge resolution for dev_printk API change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/scsi/scsi_logging.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c
index ecc5918e372a..0810e92874d2 100644
--- a/drivers/scsi/scsi_logging.c
+++ b/drivers/scsi/scsi_logging.c
@@ -99,7 +99,6 @@ int sdev_prefix_printk(const char *level, const struct scsi_device *sdev,
 	va_list args;
 	char *logbuf;
 	size_t off = 0, logbuf_len;
-	int ret;
 
 	if (!sdev)
 		return 0;
@@ -116,9 +115,9 @@ int sdev_prefix_printk(const char *level, const struct scsi_device *sdev,
 		off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
 		va_end(args);
 	}
-	ret = dev_printk(level, &sdev->sdev_gendev, "%s", logbuf);
+	dev_printk(level, &sdev->sdev_gendev, "%s", logbuf);
 	scsi_log_release_buffer(logbuf);
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL(sdev_prefix_printk);
 
@@ -128,7 +127,6 @@ int scmd_printk(const char *level, const struct scsi_cmnd *scmd,
 	va_list args;
 	char *logbuf;
 	size_t off = 0, logbuf_len;
-	int ret;
 
 	if (!scmd || !scmd->cmnd)
 		return 0;
@@ -143,9 +141,9 @@ int scmd_printk(const char *level, const struct scsi_cmnd *scmd,
 		off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
 		va_end(args);
 	}
-	ret = dev_printk(level, &scmd->device->sdev_gendev, "%s", logbuf);
+	dev_printk(level, &scmd->device->sdev_gendev, "%s", logbuf);
 	scsi_log_release_buffer(logbuf);
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL(scmd_printk);
 
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpgHzei9F1p_.pgp
Description: OpenPGP digital signature