[PATCH 02/17] phy: amlogic: convert to devm_platform_ioremap_resource

[Chunfeng Yun]

On Thu, 2020-10-29 at 09:24 +0100, Remi Pommarel wrote:
> Hi,
> 
> On Thu, Oct 29, 2020 at 10:54:24AM +0800, Chunfeng Yun wrote:
> > Use devm_platform_ioremap_resource to simplify code
> > 
> > Signed-off-by: Chunfeng Yun <chunfeng.yun at mediatek.com>
> > ---
> >  drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c | 4 +---
> >  drivers/phy/amlogic/phy-meson-axg-pcie.c             | 4 +---
> >  drivers/phy/amlogic/phy-meson-g12a-usb2.c            | 4 +---
> >  drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c       | 4 +---
> >  drivers/phy/amlogic/phy-meson-gxl-usb2.c             | 4 +---
> >  5 files changed, 5 insertions(+), 15 deletions(-)
> > 
> > diff --git a/drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c b/drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c
> > index 1431cbf885e1..7d06cda329fb 100644
> > --- a/drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c
> > +++ b/drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c
> > @@ -126,7 +126,6 @@ static int phy_axg_mipi_pcie_analog_probe(struct platform_device *pdev)
> >  	struct phy_axg_mipi_pcie_analog_priv *priv;
> >  	struct device_node *np = dev->of_node;
> >  	struct regmap *map;
> > -	struct resource *res;
> >  	void __iomem *base;
> >  	int ret;
> >  
> > @@ -134,8 +133,7 @@ static int phy_axg_mipi_pcie_analog_probe(struct platform_device *pdev)
> >  	if (!priv)
> >  		return -ENOMEM;
> >  
> > -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > -	base = devm_ioremap_resource(dev, res);
> > +	base = devm_platform_ioremap_resource(pdev, 0);
> >  	if (IS_ERR(base)) {
> >  		dev_err(dev, "failed to get regmap base\n");
> >  		return PTR_ERR(base);
> 
> This patch will conflict with [0] that uses syscon to map those shared
> resources instead and that is hopefully going to be merged soon.
> 
> So I think you can skip this file.
Ok, will drop it, thanks
> 
> > diff --git a/drivers/phy/amlogic/phy-meson-axg-pcie.c b/drivers/phy/amlogic/phy-meson-axg-pcie.c
> > index 377ed0dcd0d9..58a7507a8422 100644
> > --- a/drivers/phy/amlogic/phy-meson-axg-pcie.c
> > +++ b/drivers/phy/amlogic/phy-meson-axg-pcie.c
> > @@ -129,7 +129,6 @@ static int phy_axg_pcie_probe(struct platform_device *pdev)
> >  	struct device *dev = &pdev->dev;
> >  	struct phy_axg_pcie_priv *priv;
> >  	struct device_node *np = dev->of_node;
> > -	struct resource *res;
> >  	void __iomem *base;
> >  	int ret;
> >  
> > @@ -145,8 +144,7 @@ static int phy_axg_pcie_probe(struct platform_device *pdev)
> >  		return ret;
> >  	}
> >  
> > -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > -	base = devm_ioremap_resource(dev, res);
> > +	base = devm_platform_ioremap_resource(pdev, 0);
> >  	if (IS_ERR(base))
> >  		return PTR_ERR(base);
> >  
> > diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb2.c b/drivers/phy/amlogic/phy-meson-g12a-usb2.c
> > index b26e30e1afaf..9d1efa0d9394 100644
> > --- a/drivers/phy/amlogic/phy-meson-g12a-usb2.c
> > +++ b/drivers/phy/amlogic/phy-meson-g12a-usb2.c
> > @@ -292,7 +292,6 @@ static int phy_meson_g12a_usb2_probe(struct platform_device *pdev)
> >  {
> >  	struct device *dev = &pdev->dev;
> >  	struct phy_provider *phy_provider;
> > -	struct resource *res;
> >  	struct phy_meson_g12a_usb2_priv *priv;
> >  	struct phy *phy;
> >  	void __iomem *base;
> > @@ -305,8 +304,7 @@ static int phy_meson_g12a_usb2_probe(struct platform_device *pdev)
> >  	priv->dev = dev;
> >  	platform_set_drvdata(pdev, priv);
> >  
> > -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > -	base = devm_ioremap_resource(dev, res);
> > +	base = devm_platform_ioremap_resource(pdev, 0);
> >  	if (IS_ERR(base))
> >  		return PTR_ERR(base);
> >  
> > diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
> > index 08e322789e59..ebe3d0ddd304 100644
> > --- a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
> > +++ b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
> > @@ -386,7 +386,6 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)
> >  	struct device *dev = &pdev->dev;
> >  	struct device_node *np = dev->of_node;
> >  	struct phy_g12a_usb3_pcie_priv *priv;
> > -	struct resource *res;
> >  	struct phy_provider *phy_provider;
> >  	void __iomem *base;
> >  	int ret;
> > @@ -395,8 +394,7 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)
> >  	if (!priv)
> >  		return -ENOMEM;
> >  
> > -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > -	base = devm_ioremap_resource(dev, res);
> > +	base = devm_platform_ioremap_resource(pdev, 0);
> >  	if (IS_ERR(base))
> >  		return PTR_ERR(base);
> >  
> > diff --git a/drivers/phy/amlogic/phy-meson-gxl-usb2.c b/drivers/phy/amlogic/phy-meson-gxl-usb2.c
> > index 43ec9bf24abf..875afb2672c7 100644
> > --- a/drivers/phy/amlogic/phy-meson-gxl-usb2.c
> > +++ b/drivers/phy/amlogic/phy-meson-gxl-usb2.c
> > @@ -230,7 +230,6 @@ static int phy_meson_gxl_usb2_probe(struct platform_device *pdev)
> >  {
> >  	struct device *dev = &pdev->dev;
> >  	struct phy_provider *phy_provider;
> > -	struct resource *res;
> >  	struct phy_meson_gxl_usb2_priv *priv;
> >  	struct phy *phy;
> >  	void __iomem *base;
> > @@ -242,8 +241,7 @@ static int phy_meson_gxl_usb2_probe(struct platform_device *pdev)
> >  
> >  	platform_set_drvdata(pdev, priv);
> >  
> > -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > -	base = devm_ioremap_resource(dev, res);
> > +	base = devm_platform_ioremap_resource(pdev, 0);
> >  	if (IS_ERR(base))
> >  		return PTR_ERR(base);
> >  
> 
> So without the modification on phy-meson-axg-mipi-pcie-analog.c and
> FWIW,
> 
> Reviewed-by: Remi Pommarel <repk at triplefau.lt>
> 
> Thanks,
> 
> [0] https://patchwork.kernel.org/project/linux-amlogic/patch/20200915130339.11079-4-narmstrong@baylibre.com/
>