Commit 45b76168 authored by Philipp Stanner's avatar Philipp Stanner Committed by Jakub Kicinski
Browse files

stmmac: Replace deprecated PCI functions 



The PCI functions
  - pcim_iomap_regions() and
  - pcim_iomap_table()
have been deprecated.

Replace them with their successor function, pcim_iomap_region().

Make variable declaration order at closeby places comply with reverse
christmas tree order.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Tested-by: default avatarHenry Chen <chenx97@aosc.io>
Signed-off-by: default avatarPhilipp Stanner <phasta@kernel.org>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20250324092928.9482-6-phasta@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d327a12e

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c

+3 −5
Original line number Diff line number Diff line
@@ -533,8 +533,8 @@ static int loongson_dwmac_fix_reset(void *priv, void __iomem *ioaddr) 
static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct plat_stmmacenet_data *plat;

	struct stmmac_resources res = {};

	struct stmmac_pci_info *info;

	struct stmmac_resources res;

	struct loongson_data *ld;

	int ret;
@@ -566,13 +566,11 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id 
	pci_set_master(pdev);



	/* Get the base address of device */

	ret = pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME);

	res.addr = pcim_iomap_region(pdev, 0, DRIVER_NAME);

	ret = PTR_ERR_OR_ZERO(res.addr);

	if (ret)

		goto err_disable_device;



	memset(&res, 0, sizeof(res));

	res.addr = pcim_iomap_table(pdev)[0];



	plat->bsp_priv = ld;

	plat->setup = loongson_dwmac_setup;

	plat->fix_soc_reset = loongson_dwmac_fix_reset;

drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c

+5 −7
Original line number Diff line number Diff line
@@ -155,9 +155,9 @@ static int stmmac_pci_probe(struct pci_dev *pdev, 
{

	struct stmmac_pci_info *info = (struct stmmac_pci_info *)id->driver_data;

	struct plat_stmmacenet_data *plat;

	struct stmmac_resources res;

	int i;

	struct stmmac_resources res = {};

	int ret;

	int i;



	plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);

	if (!plat)
@@ -192,9 +192,9 @@ static int stmmac_pci_probe(struct pci_dev *pdev, 
	for (i = 0; i < PCI_STD_NUM_BARS; i++) {

		if (pci_resource_len(pdev, i) == 0)

			continue;

		ret = pcim_iomap_regions(pdev, BIT(i), pci_name(pdev));

		if (ret)

			return ret;

		res.addr = pcim_iomap_region(pdev, i, STMMAC_RESOURCE_NAME);

		if (IS_ERR(res.addr))

			return PTR_ERR(res.addr);

		break;

	}
@@ -204,8 +204,6 @@ static int stmmac_pci_probe(struct pci_dev *pdev, 
	if (ret)

		return ret;



	memset(&res, 0, sizeof(res));

	res.addr = pcim_iomap_table(pdev)[i];

	res.wol_irq = pdev->irq;

	res.irq = pdev->irq;