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

Commit 22e0d994 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: introduce sdev_prefix_printk() 



Like scmd_printk(), but the device name is passed in as
a string. Can be used by eg ULDs which do not have access
to the scsi_cmnd structure.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f75ae8ed

drivers/scsi/ch.c

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ static const char * vendor_labels[CH_TYPES-4] = { 
// module_param_string_array(vendor_labels, NULL, 0444);



#define ch_printk(prefix, ch, fmt, a...) \

	sdev_printk(prefix, (ch)->device, "[%s] " fmt, \

		    (ch)->name, ##a)

	sdev_prefix_printk(prefix, (ch)->device, (ch)->name, fmt, ##a)



#define DPRINTK(fmt, arg...)						\

do {									\

drivers/scsi/sd.h

+3 −3
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ static inline struct scsi_disk *scsi_disk(struct gendisk *disk) 


#define sd_printk(prefix, sdsk, fmt, a...)				\

        (sdsk)->disk ?							\

	sdev_printk(prefix, (sdsk)->device, "[%s] " fmt,		\

		    (sdsk)->disk->disk_name, ##a) :			\

	      sdev_prefix_printk(prefix, (sdsk)->device,		\

				 (sdsk)->disk->disk_name, fmt, ##a) :	\

	      sdev_printk(prefix, (sdsk)->device, fmt, ##a)



#define sd_first_printk(prefix, sdsk, fmt, a...)			\

drivers/scsi/sg.c

+2 −2
Original line number Diff line number Diff line
@@ -219,8 +219,8 @@ static void sg_device_destroy(struct kref *kref); 
#define SZ_SG_REQ_INFO sizeof(sg_req_info_t)



#define sg_printk(prefix, sdp, fmt, a...) \

	sdev_printk(prefix, (sdp)->device, "[%s] " fmt, \

		    (sdp)->disk->disk_name, ##a)

	sdev_prefix_printk(prefix, (sdp)->device,		\

			   (sdp)->disk->disk_name, fmt, ##a)



static int sg_allow_access(struct file *filp, unsigned char *cmd)

{

drivers/scsi/sr.h

+1 −2
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ typedef struct scsi_cd { 
} Scsi_CD;



#define sr_printk(prefix, cd, fmt, a...) \

	sdev_printk(prefix, (cd)->device, "[%s] " fmt, \

		    (cd)->cdi.name, ##a)

	sdev_prefix_printk(prefix, (cd)->device, (cd)->cdi.name, fmt, ##a)



int sr_do_ioctl(Scsi_CD *, struct packet_command *);

drivers/scsi/st.c

+1 −2
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ static inline char *tape_name(struct scsi_tape *tape) 
}



#define st_printk(prefix, t, fmt, a...) \

	sdev_printk(prefix, (t)->device, "%s: " fmt, \

		    tape_name(t), ##a)

	sdev_prefix_printk(prefix, (t)->device, tape_name(t), fmt, ##a)

#ifdef DEBUG

#define DEBC_printk(t, fmt, a...) \

	if (debugging) { st_printk(ST_DEB_MSG, t, fmt, ##a ); }