| Message ID | 20250313161422.97174-3-phasta@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Clean up deprecated PCI calls | expand |
On 3/13/2025 9:14 AM, Philipp Stanner wrote: > loongson_dwmac_probe() contains a loop which doesn't have an effect, > because it tries to call pcim_iomap_regions() with the same parameters > several times. The break statement at the loop's end furthermore ensures > that the loop only runs once anyways. > > Remove the surplus loop. > > Signed-off-by: Philipp Stanner <phasta@kernel.org> > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > Reviewed-by: Yanteng Si <si.yanteng@linux.dev> > Reviewed-by: Huacai Chen <chenhuacai@loongson.cn> > Tested-by: Henry Chen <chenx97@aosc.io> > --- > .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c > index 73a6715a93e6..e2959ac5c1ca 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c > @@ -524,7 +524,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id > struct stmmac_pci_info *info; > struct stmmac_resources res; > struct loongson_data *ld; > - int ret, i; > + int ret; > > plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL); > if (!plat) > @@ -554,14 +554,9 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id > pci_set_master(pdev); > > /* Get the base address of device */ > - for (i = 0; i < PCI_STD_NUM_BARS; i++) { > - if (pci_resource_len(pdev, i) == 0) > - continue; > - ret = pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME); > - if (ret) > - goto err_disable_device; > - break; > - } This nonsensical code has been here since the beginning of the Loongson support in commit 30bba69d7db4 ("stmmac: pci: Add dwmac support for Loongson") Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c index 73a6715a93e6..e2959ac5c1ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -524,7 +524,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id struct stmmac_pci_info *info; struct stmmac_resources res; struct loongson_data *ld; - int ret, i; + int ret; plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL); if (!plat) @@ -554,14 +554,9 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id pci_set_master(pdev); /* Get the base address of device */ - for (i = 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i) == 0) - continue; - ret = pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME); - if (ret) - goto err_disable_device; - break; - } + ret = pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME); + if (ret) + goto err_disable_device; memset(&res, 0, sizeof(res)); res.addr = pcim_iomap_table(pdev)[0];