Commit 414e0a64 authored by dingsenjie's avatar dingsenjie Committed by Mauro Carvalho Chehab
Browse files

media: qcom/camss: Use devm_platform_ioremap_resource_byname 



Use the devm_platform_ioremap_resource_byname() helper instead of
calling platform_get_resource_byname() and devm_ioremap_resource()
separately.

Signed-off-by: default avatardingsenjie <dingsenjie@yulong.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 67a7e53d

drivers/media/platform/qcom/camss/camss-csid.c

+1 −2
Original line number Diff line number Diff line
@@ -566,8 +566,7 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid, 


	/* Memory */



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);

	csid->base = devm_ioremap_resource(dev, r);

	csid->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);

	if (IS_ERR(csid->base))

		return PTR_ERR(csid->base);

drivers/media/platform/qcom/camss/camss-csiphy.c

+3 −5
Original line number Diff line number Diff line
@@ -591,16 +591,14 @@ int msm_csiphy_subdev_init(struct camss *camss, 


	/* Memory */



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);

	csiphy->base = devm_ioremap_resource(dev, r);

	csiphy->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);

	if (IS_ERR(csiphy->base))

		return PTR_ERR(csiphy->base);



	if (camss->version == CAMSS_8x16 ||

	    camss->version == CAMSS_8x96) {

		r = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						 res->reg[1]);

		csiphy->base_clk_mux = devm_ioremap_resource(dev, r);

		csiphy->base_clk_mux =

			devm_platform_ioremap_resource_byname(pdev, res->reg[1]);

		if (IS_ERR(csiphy->base_clk_mux))

			return PTR_ERR(csiphy->base_clk_mux);

	} else {

drivers/media/platform/qcom/camss/camss-ispif.c

+2 −4
Original line number Diff line number Diff line
@@ -1143,13 +1143,11 @@ int msm_ispif_subdev_init(struct camss *camss, 


	/* Memory */



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);

	ispif->base = devm_ioremap_resource(dev, r);

	ispif->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);

	if (IS_ERR(ispif->base))

		return PTR_ERR(ispif->base);



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[1]);

	ispif->base_clk_mux = devm_ioremap_resource(dev, r);

	ispif->base_clk_mux = devm_platform_ioremap_resource_byname(pdev, res->reg[1]);

	if (IS_ERR(ispif->base_clk_mux))

		return PTR_ERR(ispif->base_clk_mux);

drivers/media/platform/qcom/camss/camss-vfe.c

+1 −2
Original line number Diff line number Diff line
@@ -1301,8 +1301,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, 


	/* Memory */



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);

	vfe->base = devm_ioremap_resource(dev, r);

	vfe->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);

	if (IS_ERR(vfe->base)) {

		dev_err(dev, "could not map memory\n");

		return PTR_ERR(vfe->base);