Unverified Commit 4cb9d648 authored by Mark Brown's avatar Mark Brown
Browse files

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

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

Use devm_platform_get_and_ioremap_resource() to simplify
code.

Yang Yingliang (3):
  ASoC: stm32: i2s: Use devm_platform_get_and_ioremap_resource()
  ASoC: stm32: sai: Use devm_platform_get_and_ioremap_resource()
  ASoC: stm32: spdifrx: Use devm_platform_get_and_ioremap_resource()

 sound/soc/stm/stm32_i2s.c     | 3 +--
 sound/soc/stm/stm32_sai_sub.c | 3 +--
 sound/soc/stm/stm32_spdifrx.c | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

--
2.25.1
parents 114bacc7 f3babad4

sound/soc/stm/stm32_i2s.c

+1 −2
Original line number Diff line number Diff line
@@ -1036,8 +1036,7 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev, 
	else

		return -EINVAL;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	i2s->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(i2s->base))

		return PTR_ERR(i2s->base);

sound/soc/stm/stm32_sai_sub.c

+1 −2
Original line number Diff line number Diff line
@@ -1361,8 +1361,7 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev, 
	if (!np)

		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(base))

		return PTR_ERR(base);

sound/soc/stm/stm32_spdifrx.c

+1 −2
Original line number Diff line number Diff line
@@ -922,8 +922,7 @@ static int stm32_spdifrx_parse_of(struct platform_device *pdev, 
	else

		return -EINVAL;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	spdifrx->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(spdifrx->base))

		return PTR_ERR(spdifrx->base);