| Message ID | 20230802080726.178194-1-wangxiongfeng2@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | fpga: dfl-pci: Use pci_find_vsec_capability() to simplify the code | expand |
On 2023-08-02 at 16:07:26 +0800, Xiongfeng Wang wrote: > PCI core add pci_find_vsec_capability() to query VSEC. We can use that > core API to simplify the code. > > Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> Acked-by: Xu Yilun <yilun.xu@intel.com> Applied to for-next. Thanks. > --- > drivers/fpga/dfl-pci.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c > index 1bc04378118c..98b8fd16183e 100644 > --- a/drivers/fpga/dfl-pci.c > +++ b/drivers/fpga/dfl-pci.c > @@ -156,19 +156,12 @@ static int *cci_pci_create_irq_table(struct pci_dev *pcidev, unsigned int nvec) > > static int find_dfls_by_vsec(struct pci_dev *pcidev, struct dfl_fpga_enum_info *info) > { > - u32 bir, offset, vndr_hdr, dfl_cnt, dfl_res; > - int dfl_res_off, i, bars, voff = 0; > + u32 bir, offset, dfl_cnt, dfl_res; > + int dfl_res_off, i, bars, voff; > resource_size_t start, len; > > - while ((voff = pci_find_next_ext_capability(pcidev, voff, PCI_EXT_CAP_ID_VNDR))) { > - vndr_hdr = 0; > - pci_read_config_dword(pcidev, voff + PCI_VNDR_HEADER, &vndr_hdr); > - > - if (PCI_VNDR_HEADER_ID(vndr_hdr) == PCI_VSEC_ID_INTEL_DFLS && > - pcidev->vendor == PCI_VENDOR_ID_INTEL) > - break; > - } > - > + voff = pci_find_vsec_capability(pcidev, PCI_VENDOR_ID_INTEL, > + PCI_VSEC_ID_INTEL_DFLS); > if (!voff) { > dev_dbg(&pcidev->dev, "%s no DFL VSEC found\n", __func__); > return -ENODEV; > -- > 2.20.1 >
diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c index 1bc04378118c..98b8fd16183e 100644 --- a/drivers/fpga/dfl-pci.c +++ b/drivers/fpga/dfl-pci.c @@ -156,19 +156,12 @@ static int *cci_pci_create_irq_table(struct pci_dev *pcidev, unsigned int nvec) static int find_dfls_by_vsec(struct pci_dev *pcidev, struct dfl_fpga_enum_info *info) { - u32 bir, offset, vndr_hdr, dfl_cnt, dfl_res; - int dfl_res_off, i, bars, voff = 0; + u32 bir, offset, dfl_cnt, dfl_res; + int dfl_res_off, i, bars, voff; resource_size_t start, len; - while ((voff = pci_find_next_ext_capability(pcidev, voff, PCI_EXT_CAP_ID_VNDR))) { - vndr_hdr = 0; - pci_read_config_dword(pcidev, voff + PCI_VNDR_HEADER, &vndr_hdr); - - if (PCI_VNDR_HEADER_ID(vndr_hdr) == PCI_VSEC_ID_INTEL_DFLS && - pcidev->vendor == PCI_VENDOR_ID_INTEL) - break; - } - + voff = pci_find_vsec_capability(pcidev, PCI_VENDOR_ID_INTEL, + PCI_VSEC_ID_INTEL_DFLS); if (!voff) { dev_dbg(&pcidev->dev, "%s no DFL VSEC found\n", __func__); return -ENODEV;
PCI core add pci_find_vsec_capability() to query VSEC. We can use that core API to simplify the code. Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> --- drivers/fpga/dfl-pci.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)