Commit 912f1028 authored by Honggang Li's avatar Honggang Li Committed by Greg Kroah-Hartman
Browse files

staging: unisys/virthba/virthba.c print u64 with %llu 



drivers/staging/unisys/virthba/virthba.c:520:2: warning: format ‘%u’
expects argument of type ‘unsigned int’, but argument 4 has type ‘u64’
[-Wformat=]
drivers/staging/unisys/virthba/virthba.c:749:2: warning: format ‘%d’
expects argument of type ‘int’, but argument 5 has type ‘u64’
[-Wformat=]
drivers/staging/unisys/virthba/virthba.c:1142:4: warning: format ‘%d’
expects argument of type ‘int’, but argument 7 has type ‘u64’
[-Wformat=]
drivers/staging/unisys/virthba/virthba.c:1151:5: warning: format ‘%d’
expects argument of type ‘int’, but argument 5 has type ‘u64’
[-Wformat=]

After apply the patch:
linux-next]$ make C=1 drivers/staging/unisys/virthba/virthba.o
  CHK     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  CALL    scripts/checksyscalls.sh
  CHECK   drivers/staging/unisys/virthba/virthba.c
  CC [M]  drivers/staging/unisys/virthba/virthba.o

Signed-off-by: default avatarHonggang Li <enjoymindful@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e22a4a0f

drivers/staging/unisys/virthba/virthba.c

+4 −4
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id) 
	    (unsigned short) (virtpcidev->scsi.max.max_io_size / PAGE_SIZE);

	if (scsihost->sg_tablesize > MAX_PHYS_INFO)

		scsihost->sg_tablesize = MAX_PHYS_INFO;

	LOGINF("scsihost->max_channel=%u, max_id=%u, max_lun=%u, cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n",

	LOGINF("scsihost->max_channel=%u, max_id=%u, max_lun=%llu, cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n",

	     scsihost->max_channel, scsihost->max_id, scsihost->max_lun,

	     scsihost->cmd_per_lun, scsihost->max_sectors,

	     scsihost->sg_tablesize);
@@ -746,7 +746,7 @@ forward_taskmgmt_command(TASK_MGMT_TYPES tasktype, struct scsi_device *scsidev) 
	int notifyresult = 0xffff;

	wait_queue_head_t notifyevent;



	LOGINF("TaskMgmt:%d %d:%d:%d\n", tasktype,

	LOGINF("TaskMgmt:%d %d:%d:%llu\n", tasktype,

	       scsidev->channel, scsidev->id, scsidev->lun);



	if (virthbainfo->serverdown || virthbainfo->serverchangingstate) {
@@ -1139,7 +1139,7 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) 


		if (atomic_read(&vdisk->error_count) < VIRTHBA_ERROR_COUNT) {

			atomic_inc(&vdisk->error_count);

			LOGERR("SCSICMD ****FAILED scsicmd:0x%p op:0x%x <%d:%d:%d:%d> 0x%x-0x%x-0x%x-0x%x-0x%x.\n",

			LOGERR("SCSICMD ****FAILED scsicmd:0x%p op:0x%x <%d:%d:%d:%llu> 0x%x-0x%x-0x%x-0x%x-0x%x.\n",

			       scsicmd, cmdrsp->scsi.cmnd[0],

			       scsidev->host->host_no, scsidev->id,

			       scsidev->channel, scsidev->lun,
@@ -1148,7 +1148,7 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) 
			       sd->AdditionalSenseCodeQualifier);

			if (atomic_read(&vdisk->error_count) ==

			    VIRTHBA_ERROR_COUNT) {

				LOGERR("Throtling SCSICMD errors disk <%d:%d:%d:%d>\n",

				LOGERR("Throtling SCSICMD errors disk <%d:%d:%d:%llu>\n",

				     scsidev->host->host_no, scsidev->id,

				     scsidev->channel, scsidev->lun);

			}