From nobody Sat Nov 23 22:58:26 2024 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3055919F411; Sat, 9 Nov 2024 23:38:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731195507; cv=none; b=IPktpPQAkUZcX5hNC6pJtnImJaMvtTv98wgY/cdbg4Ig7XfqyLgeSspd8s/j+/0D2WSo32gy44KlLzM/oeHBPbqbcU2uaf2uYz9bYZ/7P1JUZ0CV6YeUqDJ3zo30khqb70BmhVy4L2SPCrX1BHXP0rFBODz39zIAY6ATAvIAE70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731195507; c=relaxed/simple; bh=OvRuBQRlJYqAa3zaifkQ7QNsRA0syraG1BYWxZlfJtc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mPYHtp6ih3I6L/+GxLmPcczNti9UkmDVEzGJomGDIDWck1Hgay6RSEXErAGbTivgWKemBxkj1EEK4SfDSF99tCpVAci3ZgoMbCceQcURzX1tLzDVEQ90F7ccky9wEdrqDBNvm4V+EeJDv1MFp4VX3hMVNHC4jATp9ifpuRVrDhw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eWiaA3PK; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eWiaA3PK" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-20c7ee8fe6bso33833985ad.2; Sat, 09 Nov 2024 15:38:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731195504; x=1731800304; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4WS9Cf0rpv763uMkx6ljFiQoDVVkOxO5ZGRudjYIJ+8=; b=eWiaA3PKpMaXirmtS14bAcoYl/ZLCAJtzQPIBvIKIT7syt5B14XXeql5dTR/OVpjes HqGgDUDNulUCX2L5LvfOE39qZdo1rdGScRjDCtmYNbLR+2ks2Pbb0KeRy1MBZU4OQSS1 9sm8Z8+gVSEqMqfmykXCl11AlffFI3TOb7EfLz9O285PD3Nzc2IvgJo20OBQ+0t21tPH ezHHm4H+fycKh5EcTn1gsXwgU1ybj/ToFSJqsPP9kPjyesgf1yB08sdJIYBMacjiLVrG iijS/NCxV+tgVFMIlxeFHGL3C9enyacRM/ssK8enIbObhVw8alWDmXj4qA7PfGbmv7bH wE7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731195504; x=1731800304; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4WS9Cf0rpv763uMkx6ljFiQoDVVkOxO5ZGRudjYIJ+8=; b=CCIAjkSTcsGB0NXaijXaymS9qoaOQolTG/LHHRihje0suXCrhRfOtMxen7wnOGKeh4 Z2TYFVjAbRqNLMyaPCv2gKlqs6WwXh0ks5jbhMe+lMwmlAVDlMxMOOmGRK66t1np7oTF aVmiK/sZ4CZNZsyohuqX52o2ULj0Ity1B12AfbX8xQFElW06+aO5EE+fwUC4R16bdK+P BTdxbXfbHjqzcTs3Gccd7i1zDtyE5sVg+BxemtOZzs+UTnbwYr0N0kz8J4aRck7vi+wU x+XsEfQ4dKesR8TbOgelF8j2Ysca7kmPYYOLv/AnOsr1tqwCh0R3GcCw9ET0xZmYoYdP EnDw== X-Forwarded-Encrypted: i=1; AJvYcCU63GdHSDxnz5tboOz4DxZbh48e6blnfyTnEhiFZOsTvCtuNY38CLJrSByj7LfLaaRDhha243Q2X7ql9a9Y@vger.kernel.org, AJvYcCXTkh9uciTwmNJNnphMHrd/1i6plni+4ECcsUpS/xVTCdd6LYXMkmK3hIdw7Vtucyr4prSKyeOeXgM=@vger.kernel.org X-Gm-Message-State: AOJu0YxIU8Fu7acPBPURWbma8CBp++jjtYfoxps8XIzJVMnQwfW37Yss QRBWVHqaTeYD0aXIGyawrsRub4KY+Bo5m8UnqDpXR9uxJRvjgL6qIA9/IGxI X-Google-Smtp-Source: AGHT+IFWJIUgHc1oRxZrf0aN5OX+ho3LnxY/4odziwXSjaXs6zql+r8FAmb9Rw6CT2WgI37pumpZrg== X-Received: by 2002:a17:902:f541:b0:20d:1866:ed6f with SMTP id d9443c01a7336-21183ccf11bmr103236155ad.4.1731195504224; Sat, 09 Nov 2024 15:38:24 -0800 (PST) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21177e86e30sm50116915ad.281.2024.11.09.15.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2024 15:38:23 -0800 (PST) From: Rosen Penev To: netdev@vger.kernel.org Cc: Marc Kleine-Budde , Vincent Mailhol , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Florian Fainelli , Vladimir Oltean , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Pantelis Antoniou , Marcin Wojtas , Byungho An , Kevin Brace , Francois Romieu , Michal Simek , Heiner Kallweit , Russell King , Zhao Qiang , linux-can@vger.kernel.org (open list:CAN NETWORK DRIVERS), linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Allwinner sunXi SoC support), linux-sunxi@lists.linux.dev (open list:ARM/Allwinner sunXi SoC support), linuxppc-dev@lists.ozlabs.org (open list:FREESCALE SOC FS_ENET DRIVER) Subject: [PATCH net-next] net: use pdev instead of OF funcs Date: Sat, 9 Nov 2024 15:38:21 -0800 Message-ID: <20241109233821.8619-1-rosenp@gmail.com> X-Mailer: git-send-email 2.47.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" np here is ofdev->dev.of_node. Better to use the proper functions as there's no use of children or anything else. Signed-off-by: Rosen Penev --- drivers/net/can/grcan.c | 2 +- drivers/net/can/mscan/mpc5xxx_can.c | 2 +- drivers/net/dsa/bcm_sf2.c | 4 ++-- drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- drivers/net/ethernet/freescale/fec_mpc52xx.c | 23 ++++++++++--------- .../net/ethernet/freescale/fec_mpc52xx_phy.c | 12 ++++++---- .../net/ethernet/freescale/fs_enet/mac-fcc.c | 2 +- .../net/ethernet/freescale/fs_enet/mac-fec.c | 2 +- .../net/ethernet/freescale/fs_enet/mac-scc.c | 2 +- .../net/ethernet/freescale/fs_enet/mii-fec.c | 12 ++++++---- drivers/net/ethernet/freescale/ucc_geth.c | 12 +++++----- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/moxa/moxart_ether.c | 4 ++-- .../ethernet/samsung/sxgbe/sxgbe_platform.c | 8 +++---- drivers/net/ethernet/via/via-rhine.c | 2 +- drivers/net/ethernet/via/via-velocity.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_mdio.c | 6 ++--- drivers/net/mdio/mdio-mux-mmioreg.c | 16 +++++++------ drivers/net/wan/fsl_ucc_hdlc.c | 10 ++++---- 19 files changed, 66 insertions(+), 59 deletions(-) diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c index cdf0ec9fa7f3..0a2cc0ba219f 100644 --- a/drivers/net/can/grcan.c +++ b/drivers/net/can/grcan.c @@ -1673,7 +1673,7 @@ static int grcan_probe(struct platform_device *ofdev) goto exit_error; } =20 - irq =3D irq_of_parse_and_map(np, GRCAN_IRQIX_IRQ); + irq =3D platform_get_irq(ofdev, GRCAN_IRQIX_IRQ); if (!irq) { dev_err(&ofdev->dev, "no irq found\n"); err =3D -ENODEV; diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mp= c5xxx_can.c index 0080c39ee182..252ad40bdb97 100644 --- a/drivers/net/can/mscan/mpc5xxx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c @@ -300,7 +300,7 @@ static int mpc5xxx_can_probe(struct platform_device *of= dev) if (!base) return dev_err_probe(&ofdev->dev, err, "couldn't ioremap\n"); =20 - irq =3D irq_of_parse_and_map(np, 0); + irq =3D platform_get_irq(ofdev, 0); if (!irq) { dev_err(&ofdev->dev, "no irq found\n"); err =3D -ENODEV; diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 43bde1f583ff..9229582efd05 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -1443,8 +1443,8 @@ static int bcm_sf2_sw_probe(struct platform_device *p= dev) of_node_put(ports); } =20 - priv->irq0 =3D irq_of_parse_and_map(dn, 0); - priv->irq1 =3D irq_of_parse_and_map(dn, 1); + priv->irq0 =3D platform_get_irq(pdev, 0); + priv->irq1 =3D platform_get_irq(pdev, 1); =20 base =3D &priv->core; for (i =3D 0; i < BCM_SF2_REGS_NUM; i++) { diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethe= rnet/allwinner/sun4i-emac.c index 2f516b950f4e..18df8d1d93fd 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -995,7 +995,7 @@ static int emac_probe(struct platform_device *pdev) =20 /* fill in parameters for net-dev structure */ ndev->base_addr =3D (unsigned long)db->membase; - ndev->irq =3D irq_of_parse_and_map(np, 0); + ndev->irq =3D platform_get_irq(pdev, 0); if (ndev->irq =3D=3D -ENXIO) { netdev_err(ndev, "No irq resource\n"); ret =3D ndev->irq; diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/eth= ernet/freescale/fec_mpc52xx.c index 2bfaf14f65c8..553d33a98c99 100644 --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c @@ -811,7 +811,7 @@ static int mpc52xx_fec_probe(struct platform_device *op) int rv; struct net_device *ndev; struct mpc52xx_fec_priv *priv =3D NULL; - struct resource mem; + struct resource *mem; const u32 *prop; int prop_size; struct device_node *np =3D op->dev.of_node; @@ -828,20 +828,21 @@ static int mpc52xx_fec_probe(struct platform_device *= op) priv->ndev =3D ndev; =20 /* Reserve FEC control zone */ - rv =3D of_address_to_resource(np, 0, &mem); - if (rv) { + mem =3D platform_get_resource(op, 0, IORESOURCE_MEM); + if (!mem) { pr_err("Error while parsing device node resource\n"); + rv =3D -ENODEV; goto err_netdev; } - if (resource_size(&mem) < sizeof(struct mpc52xx_fec)) { + if (resource_size(mem) < sizeof(struct mpc52xx_fec)) { pr_err("invalid resource size (%lx < %x), check mpc52xx_devices.c\n", - (unsigned long)resource_size(&mem), + (unsigned long)resource_size(mem), sizeof(struct mpc52xx_fec)); rv =3D -EINVAL; goto err_netdev; } =20 - if (!request_mem_region(mem.start, sizeof(struct mpc52xx_fec), + if (!request_mem_region(mem->start, sizeof(struct mpc52xx_fec), DRIVER_NAME)) { rv =3D -EBUSY; goto err_netdev; @@ -851,13 +852,13 @@ static int mpc52xx_fec_probe(struct platform_device *= op) ndev->netdev_ops =3D &mpc52xx_fec_netdev_ops; ndev->ethtool_ops =3D &mpc52xx_fec_ethtool_ops; ndev->watchdog_timeo =3D FEC_WATCHDOG_TIMEOUT; - ndev->base_addr =3D mem.start; + ndev->base_addr =3D mem->start; SET_NETDEV_DEV(ndev, &op->dev); =20 spin_lock_init(&priv->lock); =20 /* ioremap the zones */ - priv->fec =3D ioremap(mem.start, sizeof(struct mpc52xx_fec)); + priv->fec =3D ioremap(mem->start, sizeof(struct mpc52xx_fec)); =20 if (!priv->fec) { rv =3D -ENOMEM; @@ -879,9 +880,9 @@ static int mpc52xx_fec_probe(struct platform_device *op) =20 /* Get the IRQ we need one by one */ /* Control */ - ndev->irq =3D irq_of_parse_and_map(np, 0); + ndev->irq =3D platform_get_irq(op, 0); =20 - /* RX */ + /* RX */ priv->r_irq =3D bcom_get_task_irq(priv->rx_dmatsk); =20 /* TX */ @@ -967,7 +968,7 @@ static int mpc52xx_fec_probe(struct platform_device *op) bcom_fec_tx_release(priv->tx_dmatsk); iounmap(priv->fec); err_mem_region: - release_mem_region(mem.start, sizeof(struct mpc52xx_fec)); + release_mem_region(mem->start, sizeof(struct mpc52xx_fec)); err_netdev: free_netdev(ndev); =20 diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c b/drivers/net= /ethernet/freescale/fec_mpc52xx_phy.c index 3d073f0fae63..4ffab516f770 100644 --- a/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c +++ b/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c @@ -68,7 +68,7 @@ static int mpc52xx_fec_mdio_probe(struct platform_device = *of) struct device_node *np =3D of->dev.of_node; struct mii_bus *bus; struct mpc52xx_fec_mdio_priv *priv; - struct resource res; + struct resource *res; int err; =20 bus =3D mdiobus_alloc(); @@ -85,16 +85,18 @@ static int mpc52xx_fec_mdio_probe(struct platform_devic= e *of) bus->write =3D mpc52xx_fec_mdio_write; =20 /* setup registers */ - err =3D of_address_to_resource(np, 0, &res); - if (err) + res =3D platform_get_resource(of, 0, IORESOURCE_MEM); + if (!res) { + err =3D -ENODEV; goto out_free; - priv->regs =3D ioremap(res.start, resource_size(&res)); + } + priv->regs =3D ioremap(res->start, resource_size(res)); if (priv->regs =3D=3D NULL) { err =3D -ENOMEM; goto out_free; } =20 - snprintf(bus->id, MII_BUS_ID_SIZE, "%pa", &res.start); + snprintf(bus->id, MII_BUS_ID_SIZE, "%pa", &res->start); bus->priv =3D priv; =20 bus->parent =3D dev; diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net= /ethernet/freescale/fs_enet/mac-fcc.c index be63293511d9..8bed0ea11dd1 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c @@ -83,7 +83,7 @@ static int do_pd_setup(struct fs_enet_private *fep) struct fs_platform_info *fpi =3D fep->fpi; int ret =3D -EINVAL; =20 - fep->interrupt =3D irq_of_parse_and_map(ofdev->dev.of_node, 0); + fep->interrupt =3D platform_get_irq(ofdev, 0); if (!fep->interrupt) goto out; =20 diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net= /ethernet/freescale/fs_enet/mac-fec.c index f2ecd20027cf..8dbd624b87ac 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c @@ -88,7 +88,7 @@ static int do_pd_setup(struct fs_enet_private *fep) { struct platform_device *ofdev =3D to_platform_device(fep->dev); =20 - fep->interrupt =3D irq_of_parse_and_map(ofdev->dev.of_node, 0); + fep->interrupt =3D platform_get_irq(ofdev, 0); if (!fep->interrupt) return -EINVAL; =20 diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net= /ethernet/freescale/fs_enet/mac-scc.c index 6c97191649de..53d67fb08bad 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c @@ -87,7 +87,7 @@ static int do_pd_setup(struct fs_enet_private *fep) { struct platform_device *ofdev =3D to_platform_device(fep->dev); =20 - fep->interrupt =3D irq_of_parse_and_map(ofdev->dev.of_node, 0); + fep->interrupt =3D platform_get_irq(ofdev, 0); if (!fep->interrupt) return -EINVAL; =20 diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net= /ethernet/freescale/fs_enet/mii-fec.c index dec31b638941..0e6faba74e34 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c @@ -96,7 +96,7 @@ static int fs_enet_fec_mii_write(struct mii_bus *bus, int= phy_id, int location, =20 static int fs_enet_mdio_probe(struct platform_device *ofdev) { - struct resource res; + struct resource *res; struct mii_bus *new_bus; struct fec_info *fec; int (*get_bus_freq)(struct device *); @@ -117,13 +117,15 @@ static int fs_enet_mdio_probe(struct platform_device = *ofdev) new_bus->read =3D &fs_enet_fec_mii_read; new_bus->write =3D &fs_enet_fec_mii_write; =20 - ret =3D of_address_to_resource(ofdev->dev.of_node, 0, &res); - if (ret) + res =3D platform_get_resource(ofdev, 0, IORESOURCE_MEM); + if (!res) { + ret =3D -ENODEV; goto out_res; + } =20 - snprintf(new_bus->id, MII_BUS_ID_SIZE, "%pap", &res.start); + snprintf(new_bus->id, MII_BUS_ID_SIZE, "%pap", &res->start); =20 - fec->fecp =3D ioremap(res.start, resource_size(&res)); + fec->fecp =3D ioremap(res->start, resource_size(res)); if (!fec->fecp) { ret =3D -ENOMEM; goto out_fec; diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethern= et/freescale/ucc_geth.c index 6663c1768089..2a10486bc1f0 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -3560,7 +3560,7 @@ static int ucc_geth_probe(struct platform_device* ofd= ev) struct net_device *dev =3D NULL; struct ucc_geth_private *ugeth =3D NULL; struct ucc_geth_info *ug_info; - struct resource res; + struct resource *res; int err, ucc_num, max_speed =3D 0; const unsigned int *prop; phy_interface_t phy_interface; @@ -3605,12 +3605,12 @@ static int ucc_geth_probe(struct platform_device* o= fdev) if (err) return err; =20 - err =3D of_address_to_resource(np, 0, &res); - if (err) - return err; + res =3D platform_get_resource(ofdev 0, IORESOURCE_MEM); + if (!res) + return -ENODEV; =20 - ug_info->uf_info.regs =3D res.start; - ug_info->uf_info.irq =3D irq_of_parse_and_map(np, 0); + ug_info->uf_info.regs =3D res->start; + ug_info->uf_info.irq =3D platform_get_irq(ofdev, 0); =20 ug_info->phy_node =3D of_parse_phandle(np, "phy-handle", 0); if (!ug_info->phy_node && of_phy_is_fixed_link(np)) { diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/m= arvell/mvneta.c index 1fb285fa0bdb..0da7084b80c4 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -5511,7 +5511,7 @@ static int mvneta_probe(struct platform_device *pdev) pp->neta_ac5 =3D true; } =20 - dev->irq =3D irq_of_parse_and_map(dn, 0); + dev->irq =3D platform_get_irq(pdev, 0); if (dev->irq =3D=3D 0) return -EINVAL; =20 diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/etherne= t/moxa/moxart_ether.c index 8bd60168624a..f995591dc43b 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -465,9 +465,9 @@ static int moxart_mac_probe(struct platform_device *pde= v) if (!ndev) return -ENOMEM; =20 - irq =3D irq_of_parse_and_map(node, 0); + irq =3D platform_get_irq(pdev, 0); if (irq <=3D 0) { - netdev_err(ndev, "irq_of_parse_and_map failed\n"); + netdev_err(ndev, "platform_get_irq failed\n"); ret =3D -EINVAL; goto irq_map_fail; } diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/= net/ethernet/samsung/sxgbe/sxgbe_platform.c index 2eccc7617507..4118e35b99e5 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c @@ -111,7 +111,7 @@ static int sxgbe_platform_probe(struct platform_device = *pdev) } =20 /* Get the SXGBE common INT information */ - priv->irq =3D irq_of_parse_and_map(node, 0); + priv->irq =3D platform_get_irq(pdev, 0); if (priv->irq <=3D 0) { dev_err(dev, "sxgbe common irq parsing failed\n"); goto err_drv_remove; @@ -122,7 +122,7 @@ static int sxgbe_platform_probe(struct platform_device = *pdev) =20 /* Get the TX/RX IRQ numbers */ for (i =3D 0, chan =3D 1; i < SXGBE_TX_QUEUES; i++) { - priv->txq[i]->irq_no =3D irq_of_parse_and_map(node, chan++); + priv->txq[i]->irq_no =3D platform_get_irq(pdev, chan++); if (priv->txq[i]->irq_no <=3D 0) { dev_err(dev, "sxgbe tx irq parsing failed\n"); goto err_tx_irq_unmap; @@ -130,14 +130,14 @@ static int sxgbe_platform_probe(struct platform_devic= e *pdev) } =20 for (i =3D 0; i < SXGBE_RX_QUEUES; i++) { - priv->rxq[i]->irq_no =3D irq_of_parse_and_map(node, chan++); + priv->rxq[i]->irq_no =3D platform_get_irq(pdev, chan++); if (priv->rxq[i]->irq_no <=3D 0) { dev_err(dev, "sxgbe rx irq parsing failed\n"); goto err_rx_irq_unmap; } } =20 - priv->lpi_irq =3D irq_of_parse_and_map(node, chan); + priv->lpi_irq =3D platform_get_irq(pdev, chan); if (priv->lpi_irq <=3D 0) { dev_err(dev, "sxgbe lpi irq parsing failed\n"); goto err_rx_irq_unmap; diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/vi= a/via-rhine.c index 894911f3d560..f079242c33e2 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -1127,7 +1127,7 @@ static int rhine_init_one_platform(struct platform_de= vice *pdev) if (IS_ERR(ioaddr)) return PTR_ERR(ioaddr); =20 - irq =3D irq_of_parse_and_map(pdev->dev.of_node, 0); + irq =3D platform_get_irq(pdev, 0); if (!irq) return -EINVAL; =20 diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet= /via/via-velocity.c index dd4a07c97eee..4aac9599c14d 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c @@ -2950,7 +2950,7 @@ static int velocity_platform_probe(struct platform_de= vice *pdev) if (!info) return -EINVAL; =20 - irq =3D irq_of_parse_and_map(pdev->dev.of_node, 0); + irq =3D platform_get_irq(pdev, 0); if (!irq) return -EINVAL; =20 diff --git a/drivers/net/ethernet/xilinx/ll_temac_mdio.c b/drivers/net/ethe= rnet/xilinx/ll_temac_mdio.c index 07a9fb49eda1..4bc5d47ecb7e 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_mdio.c +++ b/drivers/net/ethernet/xilinx/ll_temac_mdio.c @@ -69,7 +69,7 @@ int temac_mdio_setup(struct temac_local *lp, struct platf= orm_device *pdev) u32 bus_hz; int clk_div; int rc; - struct resource res; + struct resource *res; =20 /* Get MDIO bus frequency (if specified) */ bus_hz =3D 0; @@ -98,9 +98,9 @@ int temac_mdio_setup(struct temac_local *lp, struct platf= orm_device *pdev) return -ENOMEM; =20 if (np) { - of_address_to_resource(np, 0, &res); + res =3D platform_get_resource(pdev, 0, IORESOURCE_MEM); snprintf(bus->id, MII_BUS_ID_SIZE, "%.8llx", - (unsigned long long)res.start); + (unsigned long long)res->start); } else if (pdata) { snprintf(bus->id, MII_BUS_ID_SIZE, "%.8llx", pdata->mdio_bus_id); diff --git a/drivers/net/mdio/mdio-mux-mmioreg.c b/drivers/net/mdio/mdio-mu= x-mmioreg.c index 9c4b1efd0d53..b5a65a1ab406 100644 --- a/drivers/net/mdio/mdio-mux-mmioreg.c +++ b/drivers/net/mdio/mdio-mux-mmioreg.c @@ -98,7 +98,7 @@ static int mdio_mux_mmioreg_probe(struct platform_device = *pdev) { struct device_node *np =3D pdev->dev.of_node; struct mdio_mux_mmioreg_state *s; - struct resource res; + struct resource *res; const __be32 *iprop; int len, ret; =20 @@ -108,13 +108,15 @@ static int mdio_mux_mmioreg_probe(struct platform_dev= ice *pdev) if (!s) return -ENOMEM; =20 - ret =3D of_address_to_resource(np, 0, &res); - if (ret) - return dev_err_probe(&pdev->dev, ret, - "could not obtain memory map for node %pOF\n", np); - s->phys =3D res.start; + res =3D platform_get_resource(pdev, 0, IORESOURCE_MEM); + if (!res) { + dev_err(&pdev->dev, + "could not obtain memory map for node %pOF\n", np); + return -ENODEV; + } + s->phys =3D res->start; =20 - s->iosize =3D resource_size(&res); + s->iosize =3D resource_size(res); if (s->iosize !=3D sizeof(uint8_t) && s->iosize !=3D sizeof(uint16_t) && s->iosize !=3D sizeof(uint32_t)) diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index f999798a5612..414a9d22da5e 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -1118,7 +1118,7 @@ static int ucc_hdlc_probe(struct platform_device *pde= v) struct ucc_hdlc_private *uhdlc_priv =3D NULL; struct ucc_tdm_info *ut_info; struct ucc_tdm *utdm =3D NULL; - struct resource res; + struct resource *res; struct net_device *dev; hdlc_device *hdlc; int ucc_num; @@ -1170,12 +1170,12 @@ static int ucc_hdlc_probe(struct platform_device *p= dev) return -EINVAL; } =20 - ret =3D of_address_to_resource(np, 0, &res); - if (ret) + res =3D platform_get_resource(pdev, 0, IORESOURCE_MEM); + if (!res) return -EINVAL; =20 - ut_info->uf_info.regs =3D res.start; - ut_info->uf_info.irq =3D irq_of_parse_and_map(np, 0); + ut_info->uf_info.regs =3D res->start; + ut_info->uf_info.irq =3D platform_get_irq(pdev, 0); =20 uhdlc_priv =3D kzalloc(sizeof(*uhdlc_priv), GFP_KERNEL); if (!uhdlc_priv) --=20 2.47.0