Unverified Commit 439779ff authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: fsl: Use devm_platform_get_and_ioremap_resource()" from... 

Merge series "ASoC: fsl: Use devm_platform_get_and_ioremap_resource()" from Yang Yingliang <yangyingliang@huawei.com>:

patch #1 ~ #8:
  Use devm_platform_get_and_ioremap_resource()

patch #9
  check return value of platform_get_resource_byname()

v2:
  change error message in patch #9

Yang Yingliang (9):
  ASoC: fsl_asrc: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_aud2htx: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_easrc: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_esai: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_micfil: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_sai: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_spdif: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_ssi: Use devm_platform_get_and_ioremap_resource()
  ASoC: fsl_xcvr: check return value after calling
    platform_get_resource_byname()

 sound/soc/fsl/fsl_asrc.c    | 3 +--
 sound/soc/fsl/fsl_aud2htx.c | 3 +--
 sound/soc/fsl/fsl_easrc.c   | 3 +--
 sound/soc/fsl/fsl_esai.c    | 3 +--
 sound/soc/fsl/fsl_micfil.c  | 3 +--
 sound/soc/fsl/fsl_sai.c     | 3 +--
 sound/soc/fsl/fsl_spdif.c   | 3 +--
 sound/soc/fsl/fsl_ssi.c     | 3 +--
 sound/soc/fsl/fsl_xcvr.c    | 4 ++++
 9 files changed, 12 insertions(+), 16 deletions(-)

--
2.25.1
parents d7085db6 a2f6ed4a

sound/soc/fsl/fsl_asrc.c

+1 −2
Original line number Diff line number Diff line
@@ -1035,8 +1035,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) 
	asrc->private = asrc_priv;



	/* Get the addresses and IRQ */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(&pdev->dev, res);

	regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

sound/soc/fsl/fsl_aud2htx.c

+1 −2
Original line number Diff line number Diff line
@@ -196,8 +196,7 @@ static int fsl_aud2htx_probe(struct platform_device *pdev) 


	aud2htx->pdev = pdev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(&pdev->dev, res);

	regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

sound/soc/fsl/fsl_easrc.c

+1 −2
Original line number Diff line number Diff line
@@ -1887,8 +1887,7 @@ static int fsl_easrc_probe(struct platform_device *pdev) 
	easrc->private = easrc_priv;

	np = dev->of_node;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(dev, res);

	regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

sound/soc/fsl/fsl_esai.c

+1 −2
Original line number Diff line number Diff line
@@ -969,8 +969,7 @@ static int fsl_esai_probe(struct platform_device *pdev) 
	esai_priv->soc = of_device_get_match_data(&pdev->dev);



	/* Get the addresses and IRQ */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(&pdev->dev, res);

	regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

sound/soc/fsl/fsl_micfil.c

+1 −2
Original line number Diff line number Diff line
@@ -669,8 +669,7 @@ static int fsl_micfil_probe(struct platform_device *pdev) 
	}



	/* init regmap */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(&pdev->dev, res);

	regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);