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

Commit fe2d1851 authored by Nao Nishijima's avatar Nao Nishijima Committed by James Bottomley
Browse files

[SCSI] sd: Use sd_printk() instead of printk() 



sd_ioctl() still use printk() for log output.
It should use sd_printk() instead of printk(), as well as other sd_*.

All SCSI messages should output via s*_printk() instead of printk().

Signed-off-by: default avatarNao Nishijima <nao.nishijima.xt@hitachi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent a72c5e5e

drivers/scsi/sd.c

+4 −3
Original line number Diff line number Diff line
@@ -1066,12 +1066,13 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, 
		    unsigned int cmd, unsigned long arg)

{

	struct gendisk *disk = bdev->bd_disk;

	struct scsi_device *sdp = scsi_disk(disk)->device;

	struct scsi_disk *sdkp = scsi_disk(disk);

	struct scsi_device *sdp = sdkp->device;

	void __user *p = (void __user *)arg;

	int error;

    

	SCSI_LOG_IOCTL(1, printk("sd_ioctl: disk=%s, cmd=0x%x\n",

						disk->disk_name, cmd));

	SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, "

				    "cmd=0x%x\n", disk->disk_name, cmd));



	/*

	 * If we are in the middle of error recovery, don't let anyone