Messages in this thread | | | From | "Wu, Hao" <> | Subject | RE: [PATCH 1/2] fpga: dfl: pci: reduce the scope of variable 'ret' | Date | Fri, 17 Apr 2020 03:05:16 +0000 |
| |
> -----Original Message----- > From: Xu, Yilun <yilun.xu@intel.com> > Sent: Friday, April 17, 2020 9:56 AM > To: Tom Rix <trix@redhat.com> > Cc: Wu, Hao <hao.wu@intel.com>; mdf@kernel.org; linux- > fpga@vger.kernel.org; linux-kernel@vger.kernel.org; bhu@redhat.com > Subject: Re: [PATCH 1/2] fpga: dfl: pci: reduce the scope of variable 'ret' > > Hi Rix: > > This patch is based on linux-next. There is an preceding patch > (3c2760b78f90 "fpga: dfl: pci: fix return value of cci_pci_sriov_configure", > Also see Fixes:) in linux-next but not merged in 5.7-rc1 yet. > This patch is to fix the lkp warning brought by the previous one.
Yilun
Is it possible that commit id may be different for master then?
Thanks Hao
> > Thanks. > > On Thu, Apr 16, 2020 at 09:56:47AM -0700, Tom Rix wrote: > > Please check the scope. > > > > On linus/master, the result of this change looks like > > > > static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs) > > { > > struct cci_drvdata *drvdata = pci_get_drvdata(pcidev); > > struct dfl_fpga_cdev *cdev = drvdata->cdev; > > > > if (!num_vfs) { > > /* > > * disable SRIOV and then put released ports back to default > > * PF access mode. > > */ > > pci_disable_sriov(pcidev); > > > > dfl_fpga_cdev_config_ports_pf(cdev); > > > > } else { > > int ret; <--- defined here > > > > /* > > * before enable SRIOV, put released ports into VF access mode > > * first of all. > > */ > > ret = dfl_fpga_cdev_config_ports_vf(cdev, num_vfs); > > if (ret) > > return ret; > > > > ret = pci_enable_sriov(pcidev, num_vfs); > > if (ret) > > dfl_fpga_cdev_config_ports_pf(cdev); > > } > > > > return ret; <---- not in scope, not defined here > > } > > > > Tom
| |