From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Kishon Vijay Abraham I <kishon@ti.com>, Vinod Koul <vkoul@kernel.org>
Cc: Ondrej Jirman <megous@megous.com>,
Peter Chen <peter.chen@nxp.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Al Cooper <alcooperx@gmail.com>,
Anil Varughese <aniljoy@cadence.com>,
Wei Yongjun <weiyongjun1@huawei.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Fabio Estevam <festevam@gmail.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Kevin Hilman <khilman@baylibre.com>,
Krzysztof Kozlowski <krzk@kernel.org>,
Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>,
Chen-Yu Tsai <wens@csie.org>,
bcm-kernel-feedback-list@broadcom.com,
NXP Linux Team <linux-imx@nxp.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
Icenowy Zheng <icenowy@aosc.io>,
Bharat Gooty <bharat.gooty@broadcom.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Ray Jui <rjui@broadcom.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Maxime Ripard <mripard@kernel.org>,
Yue Wang <yue.wang@amlogic.com>, Lubomir Rintel <lkundrak@v3.sk>,
Remi Pommarel <repk@triplefau.lt>,
linux-mediatek@lists.infradead.org,
Rikard Falkeborn <rikard.falkeborn@gmail.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
Roger Quadros <rogerq@ti.com>,
Hanjie Lin <hanjie.lin@amlogic.com>,
Ma Feng <mafeng.ma@huawei.com>,
Scott Branden <sbranden@broadcom.com>,
Randy Dunlap <rdunlap@infradead.org>, Jyri Sarha <jsarha@ti.com>,
linux-kernel@vger.kernel.org, Sanket Parmar <sparmar@cadence.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Joe Perches <joe@perches.com>,
Colin Ian King <colin.king@canonical.com>,
Shawn Guo <shawnguo@kernel.org>, Li Jun <jun.li@nxp.com>
Subject: [PATCH 03/17] phy: broadcom: convert to devm_platform_ioremap_resource(_byname)
Date: Thu, 29 Oct 2020 10:54:25 +0800 [thread overview]
Message-ID: <1603940079-8131-3-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1603940079-8131-1-git-send-email-chunfeng.yun@mediatek.com>
Use devm_platform_ioremap_resource(_byname) to simplify code
Cc: Al Cooper <alcooperx@gmail.com>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
drivers/phy/broadcom/phy-bcm-cygnus-pcie.c | 4 +---
drivers/phy/broadcom/phy-bcm-kona-usb2.c | 4 +---
drivers/phy/broadcom/phy-bcm-ns-usb2.c | 4 +---
drivers/phy/broadcom/phy-bcm-ns-usb3.c | 7 ++-----
drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 13 ++++---------
drivers/phy/broadcom/phy-bcm-sr-pcie.c | 5 +----
drivers/phy/broadcom/phy-bcm-sr-usb.c | 4 +---
drivers/phy/broadcom/phy-brcm-sata.c | 8 ++------
8 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c b/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
index b074682d9dd8..548e46776100 100644
--- a/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
+++ b/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
@@ -126,7 +126,6 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
struct device_node *node = dev->of_node, *child;
struct cygnus_pcie_phy_core *core;
struct phy_provider *provider;
- struct resource *res;
unsigned cnt = 0;
int ret;
@@ -141,8 +140,7 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
core->dev = dev;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- core->base = devm_ioremap_resource(dev, res);
+ core->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(core->base))
return PTR_ERR(core->base);
diff --git a/drivers/phy/broadcom/phy-bcm-kona-usb2.c b/drivers/phy/broadcom/phy-bcm-kona-usb2.c
index 6459296d9bf9..e9cc5f2cb89a 100644
--- a/drivers/phy/broadcom/phy-bcm-kona-usb2.c
+++ b/drivers/phy/broadcom/phy-bcm-kona-usb2.c
@@ -94,7 +94,6 @@ static int bcm_kona_usb2_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct bcm_kona_usb *phy;
- struct resource *res;
struct phy *gphy;
struct phy_provider *phy_provider;
@@ -102,8 +101,7 @@ static int bcm_kona_usb2_probe(struct platform_device *pdev)
if (!phy)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- phy->regs = devm_ioremap_resource(&pdev->dev, res);
+ phy->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(phy->regs))
return PTR_ERR(phy->regs);
diff --git a/drivers/phy/broadcom/phy-bcm-ns-usb2.c b/drivers/phy/broadcom/phy-bcm-ns-usb2.c
index 9f2f84d65dcd..4b015b8a71c3 100644
--- a/drivers/phy/broadcom/phy-bcm-ns-usb2.c
+++ b/drivers/phy/broadcom/phy-bcm-ns-usb2.c
@@ -83,7 +83,6 @@ static int bcm_ns_usb2_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct bcm_ns_usb2 *usb2;
- struct resource *res;
struct phy_provider *phy_provider;
usb2 = devm_kzalloc(&pdev->dev, sizeof(*usb2), GFP_KERNEL);
@@ -91,8 +90,7 @@ static int bcm_ns_usb2_probe(struct platform_device *pdev)
return -ENOMEM;
usb2->dev = dev;
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmu");
- usb2->dmu = devm_ioremap_resource(dev, res);
+ usb2->dmu = devm_platform_ioremap_resource_byname(pdev, "dmu");
if (IS_ERR(usb2->dmu)) {
dev_err(dev, "Failed to map DMU regs\n");
return PTR_ERR(usb2->dmu);
diff --git a/drivers/phy/broadcom/phy-bcm-ns-usb3.c b/drivers/phy/broadcom/phy-bcm-ns-usb3.c
index 47b029fbebbd..42baf4d6dd5d 100644
--- a/drivers/phy/broadcom/phy-bcm-ns-usb3.c
+++ b/drivers/phy/broadcom/phy-bcm-ns-usb3.c
@@ -305,7 +305,6 @@ static int bcm_ns_usb3_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
const struct of_device_id *of_id;
struct bcm_ns_usb3 *usb3;
- struct resource *res;
struct phy_provider *phy_provider;
usb3 = devm_kzalloc(dev, sizeof(*usb3), GFP_KERNEL);
@@ -319,15 +318,13 @@ static int bcm_ns_usb3_probe(struct platform_device *pdev)
return -EINVAL;
usb3->family = (enum bcm_ns_family)of_id->data;
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmp");
- usb3->dmp = devm_ioremap_resource(dev, res);
+ usb3->dmp = devm_platform_ioremap_resource_byname(pdev, "dmp");
if (IS_ERR(usb3->dmp)) {
dev_err(dev, "Failed to map DMP regs\n");
return PTR_ERR(usb3->dmp);
}
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ccb-mii");
- usb3->ccb_mii = devm_ioremap_resource(dev, res);
+ usb3->ccb_mii = devm_platform_ioremap_resource_byname(pdev, "ccb-mii");
if (IS_ERR(usb3->ccb_mii)) {
dev_err(dev, "Failed to map ChipCommon B MII regs\n");
return PTR_ERR(usb3->ccb_mii);
diff --git a/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c b/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
index 9630ac127366..65a399acc845 100644
--- a/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
+++ b/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
@@ -293,7 +293,6 @@ static int ns2_drd_phy_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct ns2_phy_driver *driver;
struct ns2_phy_data *data;
- struct resource *res;
int ret;
u32 val;
@@ -307,23 +306,19 @@ static int ns2_drd_phy_probe(struct platform_device *pdev)
if (!driver->data)
return -ENOMEM;
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "icfg");
- driver->icfgdrd_regs = devm_ioremap_resource(dev, res);
+ driver->icfgdrd_regs = devm_platform_ioremap_resource_byname(pdev, "icfg");
if (IS_ERR(driver->icfgdrd_regs))
return PTR_ERR(driver->icfgdrd_regs);
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rst-ctrl");
- driver->idmdrd_rst_ctrl = devm_ioremap_resource(dev, res);
+ driver->idmdrd_rst_ctrl = devm_platform_ioremap_resource_byname(pdev, "rst-ctrl");
if (IS_ERR(driver->idmdrd_rst_ctrl))
return PTR_ERR(driver->idmdrd_rst_ctrl);
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crmu-ctrl");
- driver->crmu_usb2_ctrl = devm_ioremap_resource(dev, res);
+ driver->crmu_usb2_ctrl = devm_platform_ioremap_resource_byname(pdev, "crmu-ctrl");
if (IS_ERR(driver->crmu_usb2_ctrl))
return PTR_ERR(driver->crmu_usb2_ctrl);
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "usb2-strap");
- driver->usb2h_strap_reg = devm_ioremap_resource(dev, res);
+ driver->usb2h_strap_reg = devm_platform_ioremap_resource_byname(pdev, "usb2-strap");
if (IS_ERR(driver->usb2h_strap_reg))
return PTR_ERR(driver->usb2h_strap_reg);
diff --git a/drivers/phy/broadcom/phy-bcm-sr-pcie.c b/drivers/phy/broadcom/phy-bcm-sr-pcie.c
index 96a3af126a78..8a4aadf166cf 100644
--- a/drivers/phy/broadcom/phy-bcm-sr-pcie.c
+++ b/drivers/phy/broadcom/phy-bcm-sr-pcie.c
@@ -217,7 +217,6 @@ static int sr_pcie_phy_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
struct sr_pcie_phy_core *core;
- struct resource *res;
struct phy_provider *provider;
unsigned int phy_idx = 0;
@@ -226,9 +225,7 @@ static int sr_pcie_phy_probe(struct platform_device *pdev)
return -ENOMEM;
core->dev = dev;
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- core->base = devm_ioremap_resource(core->dev, res);
+ core->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(core->base))
return PTR_ERR(core->base);
diff --git a/drivers/phy/broadcom/phy-bcm-sr-usb.c b/drivers/phy/broadcom/phy-bcm-sr-usb.c
index c3e99ad17487..0002da3b5b5d 100644
--- a/drivers/phy/broadcom/phy-bcm-sr-usb.c
+++ b/drivers/phy/broadcom/phy-bcm-sr-usb.c
@@ -300,14 +300,12 @@ static int bcm_usb_phy_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device_node *dn = dev->of_node;
const struct of_device_id *of_id;
- struct resource *res;
void __iomem *regs;
int ret;
enum bcm_usb_phy_version version;
struct phy_provider *phy_provider;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- regs = devm_ioremap_resource(dev, res);
+ regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(regs))
return PTR_ERR(regs);
diff --git a/drivers/phy/broadcom/phy-brcm-sata.c b/drivers/phy/broadcom/phy-brcm-sata.c
index 18251f232172..53942973f508 100644
--- a/drivers/phy/broadcom/phy-brcm-sata.c
+++ b/drivers/phy/broadcom/phy-brcm-sata.c
@@ -726,7 +726,6 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
struct device_node *dn = dev->of_node, *child;
const struct of_device_id *of_id;
struct brcm_sata_phy *priv;
- struct resource *res;
struct phy_provider *provider;
int ret, count = 0;
@@ -739,8 +738,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
dev_set_drvdata(dev, priv);
priv->dev = dev;
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
- priv->phy_base = devm_ioremap_resource(dev, res);
+ priv->phy_base = devm_platform_ioremap_resource_byname(pdev, "phy");
if (IS_ERR(priv->phy_base))
return PTR_ERR(priv->phy_base);
@@ -751,9 +749,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
priv->version = BRCM_SATA_PHY_STB_28NM;
if (priv->version == BRCM_SATA_PHY_IPROC_NS2) {
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
- "phy-ctrl");
- priv->ctrl_base = devm_ioremap_resource(dev, res);
+ priv->ctrl_base = devm_platform_ioremap_resource_byname(pdev, "phy-ctrl");
if (IS_ERR(priv->ctrl_base))
return PTR_ERR(priv->ctrl_base);
}
--
2.18.0
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2020-10-29 2:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 2:54 [PATCH 01/17] phy: allwinner: convert to devm_platform_ioremap_resource(_byname) Chunfeng Yun
2020-10-29 2:54 ` [PATCH 02/17] phy: amlogic: convert to devm_platform_ioremap_resource Chunfeng Yun
2020-10-29 8:24 ` Remi Pommarel
2020-10-30 3:46 ` Chunfeng Yun
2020-10-29 2:54 ` Chunfeng Yun [this message]
2020-10-30 3:49 ` [PATCH 03/17] phy: broadcom: convert to devm_platform_ioremap_resource(_byname) Florian Fainelli
2020-10-29 2:54 ` [PATCH 04/17] phy: cadence: convert to devm_platform_ioremap_resource Chunfeng Yun
2020-10-29 10:50 ` Peter Chen
2020-10-29 2:54 ` [PATCH 05/17] phy: freescale: " Chunfeng Yun
2020-10-29 10:51 ` Peter Chen
2020-10-29 2:54 ` [PATCH 06/17] phy: lantiq: " Chunfeng Yun
2020-10-29 2:54 ` [PATCH 07/17] phy: marvell: " Chunfeng Yun
2020-10-29 2:54 ` [PATCH 08/17] phy: phy-xgene: " Chunfeng Yun
2020-10-29 2:54 ` [PATCH 09/17] phy: phy-mtk-ufs: " Chunfeng Yun
2020-10-29 2:54 ` [PATCH 10/17] phy: qualcomm: convert to devm_platform_ioremap_resource(_byname) Chunfeng Yun
2020-10-29 2:54 ` [PATCH 11/17] phy: phy-ralink-usb: convert to devm_platform_ioremap_resource Chunfeng Yun
2020-10-29 2:54 ` [PATCH 12/17] phy: renesas: " Chunfeng Yun
2020-10-29 2:54 ` [PATCH 13/17] phy: rockchip: " Chunfeng Yun
2020-10-29 2:54 ` [PATCH 14/17] phy: samsung: " Chunfeng Yun
2020-10-29 16:50 ` Krzysztof Kozlowski
2020-10-29 2:54 ` [PATCH 15/17] phy: phy-stm32-usbphyc: " Chunfeng Yun
2020-10-29 10:20 ` Amelie DELAUNAY
2020-10-29 2:54 ` [PATCH 16/17] phy: tegra: convert to devm_platform_ioremap_resource(_byname) Chunfeng Yun
2020-10-29 2:54 ` [PATCH 17/17] phy: ti: " Chunfeng Yun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1603940079-8131-3-git-send-email-chunfeng.yun@mediatek.com \
--to=chunfeng.yun@mediatek.com \
--cc=alcooperx@gmail.com \
--cc=aniljoy@cadence.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bharat.gooty@broadcom.com \
--cc=colin.king@canonical.com \
--cc=f.fainelli@gmail.com \
--cc=festevam@gmail.com \
--cc=hanjie.lin@amlogic.com \
--cc=icenowy@aosc.io \
--cc=jbrunet@baylibre.com \
--cc=joe@perches.com \
--cc=jsarha@ti.com \
--cc=jun.li@nxp.com \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=kishon@ti.com \
--cc=krzk@kernel.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=lkundrak@v3.sk \
--cc=lorenzo.pieralisi@arm.com \
--cc=mafeng.ma@huawei.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=matthias.bgg@gmail.com \
--cc=megous@megous.com \
--cc=mripard@kernel.org \
--cc=narmstrong@baylibre.com \
--cc=peter.chen@nxp.com \
--cc=rayagonda.kokatanur@broadcom.com \
--cc=rdunlap@infradead.org \
--cc=repk@triplefau.lt \
--cc=rikard.falkeborn@gmail.com \
--cc=rjui@broadcom.com \
--cc=rogerq@ti.com \
--cc=s.hauer@pengutronix.de \
--cc=sbranden@broadcom.com \
--cc=shawnguo@kernel.org \
--cc=sparmar@cadence.com \
--cc=vkoul@kernel.org \
--cc=weiyongjun1@huawei.com \
--cc=wens@csie.org \
--cc=yue.wang@amlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox