> On Oct 13, 2017, at 5:25 AM, Ewan D. Milne <emilne@xxxxxxxxxx> wrote:
>
> On Thu, 2017-10-12 at 23:08 -0700, Madhani, Madhani wrote:
>> From: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
>>
>> Fixes following warning reported by 0-day kernel test build
>>
>> drivers/scsi/qla2xxx/qla_iocb.c: In function 'qla2x00_els_dcmd2_iocb_timeout':
>> drivers/scsi/qla2xxx/qla_iocb.c:2611:50: warning: format '%x' expects a matching
>> 'unsigned int' argument [-Wformat=]
>> "%s %d ELS Timeout, %8phC hdl=%x, portid=%06x\n",
>>
>> drivers/scsi/qla2xxx/qla_iocb.c: In function 'qla2x00_els_dcmd2_sp_done':
>> drivers/scsi/qla2xxx/qla_iocb.c:2634:11: warning: format '%s' expects argument of type 'char *', but argument 6 has type 'uint32_t {aka unsigned int}' [-Wformat=]
>> "%s %s ELS hdl=%x, portid=%06x done %8pC\n",
>> ^
>> drivers/scsi/qla2xxx/qla_iocb.c:2634:35: warning: format '%x' expects argument of type 'unsigned int', but argument 8 has type 'uint8_t * {aka unsigned char *}' [-Wformat=]
>> "%s %s ELS hdl=%x, portid=%06x done %8pC\n",
>> ^
>> drivers/scsi/qla2xxx/qla_iocb.c:2634:44: warning: format '%p' expects a matching 'void *' argument [-Wformat=]
>> "%s %s %ELS %hdl=%x, %portid=%06x %done %8pC\n",
>> ^
>> Signed-off-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
>> ---
>> drivers/scsi/qla2xxx/qla_iocb.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
>> index 6e57c48f8d95..0502ed7ee14e 100644
>> --- a/drivers/scsi/qla2xxx/qla_iocb.c
>> +++ b/drivers/scsi/qla2xxx/qla_iocb.c
>> @@ -2608,7 +2608,7 @@ qla2x00_els_dcmd2_iocb_timeout(void *data)
>> int res;
>>
>> ql_dbg(ql_dbg_io + ql_dbg_disc, vha, 0x3069,
>> - "%s %d ELS Timeout, %8phC hdl=%x, portid=%06x\n",
>> + "%s hdl=%x ELS Timeout, %8phC portid=%06x\n",
>> sp->name, sp->handle, fcport->port_name, fcport->d_id.b24);
>>
>> /* Abort the exchange */
>> @@ -2631,7 +2631,7 @@ qla2x00_els_dcmd2_sp_done(void *ptr, int res)
>> struct scsi_qla_host *vha = sp->vha;
>>
>> ql_dbg(ql_dbg_io + ql_dbg_disc, vha, 0x3072,
>> - "%s %s ELS hdl=%x, portid=%06x done %8pC\n",
>> + "%s ELS hdl=%x, portid=%06x done %8pC\n",
>> sp->name, sp->handle, fcport->d_id.b24, fcport->port_name);
>>
>> complete(&lio->u.els_plogi.comp);
>
> Can you please just submit a corrected v2 of your earlier patch instead
> of this one?
Sure.
Martin,
let me know if you would refer me to submit v2 of the original patch or this patch is okay?
> -Ewan
>
Thanks,
Himanshu
