From patchwork Wed Dec 6 14:14:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10095923 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 44E4960329 for ; Wed, 6 Dec 2017 14:15:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33B6C29B77 for ; Wed, 6 Dec 2017 14:15:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2468429B79; Wed, 6 Dec 2017 14:15:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 131EC29B77 for ; Wed, 6 Dec 2017 14:15:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218AbdLFOP0 (ORCPT ); Wed, 6 Dec 2017 09:15:26 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:50717 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751964AbdLFOPG (ORCPT ); Wed, 6 Dec 2017 09:15:06 -0500 Received: from wuerfel.lan ([149.172.96.106]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lxftz-1fA5d73NqV-017BMJ; Wed, 06 Dec 2017 15:14:46 +0100 From: Arnd Bergmann To: Anil Gurumurthy , Sudarsana Kalluru , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Johannes Thumshirn , Hannes Reinecke , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: bfa: fix type conversion warning Date: Wed, 6 Dec 2017 15:14:18 +0100 Message-Id: <20171206141444.634681-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:GLSoyMLpFfhW24aZGB1yQa/nOaKBxEsvSshZ5WqL7MeszppqQTG ov8Y3ga4XSHeOyLqB3EXvjJCaj0JY4h8hR6T589gZEpELChm9QNicCon/kGLRKZxB8AobUD S3RXjrd4fWu5KUejJZq/FSna/ioOaFf/4R4EaTI0+18n+A9lHj0xisLfa29vzNJiT/8tYfE F2Df3DWO7znCtA/ydp7ng== X-UI-Out-Filterresults: notjunk:1; V01:K0:9lskR5Gbfvo=:l5kPxYyoQtozbB5M3C0fu8 wiT3MTv/4/dAdKEz6DaFJq6ZwGxBwN8JOs/OI4tNQ+2YqSATz55d7LJp/hil8Yp4wHctD5qkv toQ6Pqv91tyiUqyNVH9RO+BwYMDVEAzCwYDeU7jAL8JaRcsKLLtCVEojVUJujIKFz/i4FtoBC Ss7yeOQLdSAgsn5nowt4qfnVhvpp3DDT1XnLDrHft2A7MNV8FM5OCntudQRri2dJ3T+2E32tj fzU3xK69Nx4Ow75BGO+PmF5onNZhZG5epGXb/bV49byghCdJcc19PrDrF+ip7J/6RLzdXckfw 8o9qwp3MrvYkdRgSGeroIyNgFqLqrDIvR/0Br+TFrpXrugfZGI10/zDvHSVaqsOet5Rp5wwQS ibfwE0BI8GksS1UKTehCeOFR97nwMmr+7O9LqvaaUVkGTn3ziJai6janUGRKjYHMwwLPozTQq e5dk8ZxioOsk31xSlO+SkVXUOaR611aBKwwMyEdUYZtxxvQt9fPcyhVTxKVzjFrlOo6onQWCU SyYA+qf5k78c/W0Ez0DWPsvz//UiiruqNtISY5QBCZ8MaLIUHvK1nvkmx9WHk+TIykXRkSMaR c5MD5+tg6O98XxVOBtLrlCASQnxEHU5abYdKRUPLJp6juLPdbgY0SDKMCXEik5RbNr4g1JysH rf7GQl/n52mKc3L4mvcIOml/Cl4mSqZYBPyBTLq5xhXGuIJlh5D5uA2GF/CcIKHMmGHgNPC1Z Vah1ON+QHV2YjWC7ebbrTifpYcbiw2Io2VYINw== Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A regression fix introduced a harmless type mismatch warning: drivers/scsi/bfa/bfad_bsg.c: In function 'bfad_im_bsg_vendor_request': drivers/scsi/bfa/bfad_bsg.c:3137:35: error: initialization of 'struct bfad_im_port_s *' from 'long unsigned int' makes pointer from integer without a cast [-Werror=int-conversion] struct bfad_im_port_s *im_port = shost->hostdata[0]; ^~~~~ drivers/scsi/bfa/bfad_bsg.c: In function 'bfad_im_bsg_els_ct_request': drivers/scsi/bfa/bfad_bsg.c:3353:35: error: initialization of 'struct bfad_im_port_s *' from 'long unsigned int' makes pointer from integer without a cast [-Werror=int-conversion] struct bfad_im_port_s *im_port = shost->hostdata[0]; This changes the code back to shost_priv() once more, but encapsulates it in an inline function to document the rather unusual way of using the private data only as a pointer to the previously allocated structure. I did not try to get rid of the extra indirection level entirely, which would have been rather invasive and required reworking the entire initialization sequence. Fixes: 45349821ab3a ("scsi: bfa: fix access to bfad_im_port_s") Signed-off-by: Arnd Bergmann Reviewed-by: Johannes Thumshirn Reviewed-by: Hannes Reinecke --- drivers/scsi/bfa/bfad_bsg.c | 4 ++-- drivers/scsi/bfa/bfad_im.c | 6 ++++-- drivers/scsi/bfa/bfad_im.h | 10 ++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/bfa/bfad_bsg.c b/drivers/scsi/bfa/bfad_bsg.c index fa9a966e2c2a..3976e787ba64 100644 --- a/drivers/scsi/bfa/bfad_bsg.c +++ b/drivers/scsi/bfa/bfad_bsg.c @@ -3134,7 +3134,7 @@ bfad_im_bsg_vendor_request(struct bsg_job *job) struct fc_bsg_reply *bsg_reply = job->reply; uint32_t vendor_cmd = bsg_request->rqst_data.h_vendor.vendor_cmd[0]; struct Scsi_Host *shost = fc_bsg_to_shost(job); - struct bfad_im_port_s *im_port = shost->hostdata[0]; + struct bfad_im_port_s *im_port = bfad_get_im_port(shost); struct bfad_s *bfad = im_port->bfad; void *payload_kbuf; int rc = -EINVAL; @@ -3350,7 +3350,7 @@ bfad_im_bsg_els_ct_request(struct bsg_job *job) { struct bfa_bsg_data *bsg_data; struct Scsi_Host *shost = fc_bsg_to_shost(job); - struct bfad_im_port_s *im_port = shost->hostdata[0]; + struct bfad_im_port_s *im_port = bfad_get_im_port(shost); struct bfad_s *bfad = im_port->bfad; bfa_bsg_fcpt_t *bsg_fcpt; struct bfad_fcxp *drv_fcxp; diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c index 24e657a4ec80..c05d6e91e4bd 100644 --- a/drivers/scsi/bfa/bfad_im.c +++ b/drivers/scsi/bfa/bfad_im.c @@ -546,6 +546,7 @@ int bfad_im_scsi_host_alloc(struct bfad_s *bfad, struct bfad_im_port_s *im_port, struct device *dev) { + struct bfad_im_port_pointer *im_portp; int error = 1; mutex_lock(&bfad_mutex); @@ -564,7 +565,8 @@ bfad_im_scsi_host_alloc(struct bfad_s *bfad, struct bfad_im_port_s *im_port, goto out_free_idr; } - im_port->shost->hostdata[0] = (unsigned long)im_port; + im_portp = shost_priv(im_port->shost); + im_portp->p = im_port; im_port->shost->unique_id = im_port->idr_id; im_port->shost->this_id = -1; im_port->shost->max_id = MAX_FCP_TARGET; @@ -748,7 +750,7 @@ bfad_scsi_host_alloc(struct bfad_im_port_s *im_port, struct bfad_s *bfad) sht->sg_tablesize = bfad->cfg_data.io_max_sge; - return scsi_host_alloc(sht, sizeof(unsigned long)); + return scsi_host_alloc(sht, sizeof(struct bfad_im_port_pointer)); } void diff --git a/drivers/scsi/bfa/bfad_im.h b/drivers/scsi/bfa/bfad_im.h index 7f7616c52814..af66275570c3 100644 --- a/drivers/scsi/bfa/bfad_im.h +++ b/drivers/scsi/bfa/bfad_im.h @@ -69,6 +69,16 @@ struct bfad_im_port_s { struct fc_vport *fc_vport; }; +struct bfad_im_port_pointer { + struct bfad_im_port_s *p; +}; + +static inline struct bfad_im_port_s *bfad_get_im_port(struct Scsi_Host *host) +{ + struct bfad_im_port_pointer *im_portp = shost_priv(host); + return im_portp->p; +} + enum bfad_itnim_state { ITNIM_STATE_NONE, ITNIM_STATE_ONLINE,