[PATCH 04/17] phy: cadence: convert to devm_platform_ioremap_resource

Peter Chen peter.chen at nxp.com
Thu Oct 29 06:50:34 EDT 2020


On 20-10-29 10:54:26, Chunfeng Yun wrote:
> Use devm_platform_ioremap_resource to simplify code
> 
> Signed-off-by: Chunfeng Yun <chunfeng.yun at mediatek.com>
> ---
>  drivers/phy/cadence/cdns-dphy.c          | 4 +---
>  drivers/phy/cadence/phy-cadence-salvo.c  | 4 +---
>  drivers/phy/cadence/phy-cadence-sierra.c | 4 +---
>  3 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/phy/cadence/cdns-dphy.c b/drivers/phy/cadence/cdns-dphy.c
> index 90c4e9b5aac8..ba042e39cfaf 100644
> --- a/drivers/phy/cadence/cdns-dphy.c
> +++ b/drivers/phy/cadence/cdns-dphy.c
> @@ -314,7 +314,6 @@ static int cdns_dphy_probe(struct platform_device *pdev)
>  {
>  	struct phy_provider *phy_provider;
>  	struct cdns_dphy *dphy;
> -	struct resource *res;
>  	int ret;
>  
>  	dphy = devm_kzalloc(&pdev->dev, sizeof(*dphy), GFP_KERNEL);
> @@ -326,8 +325,7 @@ static int cdns_dphy_probe(struct platform_device *pdev)
>  	if (!dphy->ops)
>  		return -EINVAL;
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	dphy->regs = devm_ioremap_resource(&pdev->dev, res);
> +	dphy->regs = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(dphy->regs))
>  		return PTR_ERR(dphy->regs);
>  
> diff --git a/drivers/phy/cadence/phy-cadence-salvo.c b/drivers/phy/cadence/phy-cadence-salvo.c
> index 88e239adc3b8..51c0b98f5fd7 100644
> --- a/drivers/phy/cadence/phy-cadence-salvo.c
> +++ b/drivers/phy/cadence/phy-cadence-salvo.c
> @@ -263,7 +263,6 @@ static int cdns_salvo_phy_probe(struct platform_device *pdev)
>  	struct phy_provider *phy_provider;
>  	struct device *dev = &pdev->dev;
>  	struct cdns_salvo_phy *salvo_phy;
> -	struct resource *res;
>  	const struct of_device_id *match;
>  	struct cdns_salvo_data *data;
>  
> @@ -281,8 +280,7 @@ static int cdns_salvo_phy_probe(struct platform_device *pdev)
>  	if (IS_ERR(salvo_phy->clk))
>  		return PTR_ERR(salvo_phy->clk);
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	salvo_phy->base = devm_ioremap_resource(dev, res);
> +	salvo_phy->base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(salvo_phy->base))
>  		return PTR_ERR(salvo_phy->base);
>  
> diff --git a/drivers/phy/cadence/phy-cadence-sierra.c b/drivers/phy/cadence/phy-cadence-sierra.c
> index 453ef26fa1c7..26a0badabe38 100644
> --- a/drivers/phy/cadence/phy-cadence-sierra.c
> +++ b/drivers/phy/cadence/phy-cadence-sierra.c
> @@ -479,7 +479,6 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev)
>  	const struct of_device_id *match;
>  	struct cdns_sierra_data *data;
>  	unsigned int id_value;
> -	struct resource *res;
>  	int i, ret, node = 0;
>  	void __iomem *base;
>  	struct clk *clk;
> @@ -502,8 +501,7 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev)
>  	sp->dev = dev;
>  	sp->init_data = data;
>  
> -	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, "missing \"reg\"\n");
>  		return PTR_ERR(base);
> -- 
> 2.18.0

Acked-by: Peter Chen <peter.chen at nxp.com> for phy-cadence-salvo.c.

-- 

Thanks,
Peter Chen


More information about the linux-amlogic mailing list