From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932206AbbCIN7Z (ORCPT ); Mon, 9 Mar 2015 09:59:25 -0400 Received: from avcashub3.qlogic.com ([198.70.193.117]:29966 "EHLO avcashub1.qlogic.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932079AbbCIN7V (ORCPT ); Mon, 9 Mar 2015 09:59:21 -0400 X-Greylist: delayed 306 seconds by postgrey-1.27 at vger.kernel.org; Mon, 09 Mar 2015 09:59:21 EDT Date: Mon, 9 Mar 2015 09:54:11 -0400 From: Chad Dupuis X-X-Sender: cdupuis@administrators-macbook-pro.local To: Nicholas Mc Guire CC: "James E.J. Bottomley" , , Subject: Re: [PATCH 1/2] bnx2fc: bnx2fc_fcoe.c: match wait_for_completion_timeout return type In-Reply-To: <1425479216-11485-1-git-send-email-hofrat@osadl.org> Message-ID: References: <1425479216-11485-1-git-send-email-hofrat@osadl.org> User-Agent: Alpine 2.00 (OSX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="US-ASCII" X-Originating-IP: [10.1.4.10] disclaimer: bypass Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Looks ok. Acked-by: Chad Dupuis On Wed, 4 Mar 2015, Nicholas Mc Guire wrote: > return type of wait_for_completion_timeout is unsigned long not int. rc > is appropriately renamed, changed to type unsigned long and the > assignments fixed up. > > Signed-off-by: Nicholas Mc Guire > --- > > The was only compile tested with x86_64_defconfig + SCSI_LOWLEVEL > CONFIG_SCSI_FC_ATTRS=m, CONFIG_LIBFC=m, CONFIG_LIBFCOE=m, > CONFIG_SCSI_BNX2X_FCOE=m > > Patch is against 4.0-rc2 (localversion-next is -next-20150304) > > drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c > index 98d06d1..0082b5c 100644 > --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c > +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c > @@ -635,7 +635,7 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost) > struct bnx2fc_interface *interface = port->priv; > struct bnx2fc_hba *hba = interface->hba; > struct fcoe_statistics_params *fw_stats; > - int rc = 0; > + unsigned long time_left; > > fw_stats = (struct fcoe_statistics_params *)hba->stats_buffer; > if (!fw_stats) > @@ -646,8 +646,8 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost) > init_completion(&hba->stat_req_done); > if (bnx2fc_send_stat_req(hba)) > return bnx2fc_stats; > - rc = wait_for_completion_timeout(&hba->stat_req_done, (2 * HZ)); > - if (!rc) { > + time_left = wait_for_completion_timeout(&hba->stat_req_done, (2 * HZ)); > + if (!time_left) { > BNX2FC_HBA_DBG(lport, "FW stat req timed out\n"); > return bnx2fc_stats; > } >