Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c4a6b1e authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley
Browse files

scsi_logging: return void for dev_printk() functions 



dev_printk() is now a void function, so the related functions
scmd_printk() and sdev_prefix_printk() should be made void, too.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent f50332ff

drivers/scsi/scsi_logging.c

+9 −13
Original line number Diff line number Diff line
@@ -93,20 +93,19 @@ static size_t sdev_format_header(char *logbuf, size_t logbuf_len, 
	return off;

}



int sdev_prefix_printk(const char *level, const struct scsi_device *sdev,

void sdev_prefix_printk(const char *level, const struct scsi_device *sdev,

			const char *name, const char *fmt, ...)

{

	va_list args;

	char *logbuf;

	size_t off = 0, logbuf_len;

	int ret;



	if (!sdev)

		return 0;

		return;



	logbuf = scsi_log_reserve_buffer(&logbuf_len);

	if (!logbuf)

		return 0;

		return;



	if (name)

		off += scnprintf(logbuf + off, logbuf_len - off,
@@ -116,26 +115,24 @@ 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;

}

EXPORT_SYMBOL(sdev_prefix_printk);



int scmd_printk(const char *level, const struct scsi_cmnd *scmd,

void scmd_printk(const char *level, const struct scsi_cmnd *scmd,

		const char *fmt, ...)

{

	va_list args;

	char *logbuf;

	size_t off = 0, logbuf_len;

	int ret;



	if (!scmd || !scmd->cmnd)

		return 0;

		return;



	logbuf = scsi_log_reserve_buffer(&logbuf_len);

	if (!logbuf)

		return 0;

		return;

	off = sdev_format_header(logbuf, logbuf_len, scmd_name(scmd),

				 scmd->request->tag);

	if (off < logbuf_len) {
@@ -143,9 +140,8 @@ 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;

}

EXPORT_SYMBOL(scmd_printk);

include/scsi/scsi_device.h

+2 −2
Original line number Diff line number Diff line
@@ -237,14 +237,14 @@ struct scsi_dh_data { 
 * like scmd_printk, but the device name is passed in

 * as a string pointer

 */

__printf(4, 5) int

__printf(4, 5) void

sdev_prefix_printk(const char *, const struct scsi_device *, const char *,

		const char *, ...);



#define sdev_printk(l, sdev, fmt, a...)				\

	sdev_prefix_printk(l, sdev, NULL, fmt, ##a)



__printf(3, 4) int

__printf(3, 4) void

scmd_printk(const char *, const struct scsi_cmnd *, const char *, ...);



#define scmd_dbg(scmd, fmt, a...)					   \