Commit ed8414ab authored by Cai Huoqing's avatar Cai Huoqing Committed by Tomi Valkeinen
Browse files

drm/omap: Make use of the helper function devm_platform_ioremap_resourcexxx() 



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

Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: default avatarCai Huoqing <caihuoqing@baidu.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210831135707.4676-1-caihuoqing@baidu.com
parent b92f7ea5

drivers/gpu/drm/omapdrm/dss/dispc.c

+1 −3
Original line number Diff line number Diff line
@@ -4725,7 +4725,6 @@ static int dispc_bind(struct device *dev, struct device *master, void *data) 
	struct dispc_device *dispc;

	u32 rev;

	int r = 0;

	struct resource *dispc_mem;

	struct device_node *np = pdev->dev.of_node;



	dispc = kzalloc(sizeof(*dispc), GFP_KERNEL);
@@ -4750,8 +4749,7 @@ static int dispc_bind(struct device *dev, struct device *master, void *data) 
	if (r)

		goto err_free;



	dispc_mem = platform_get_resource(dispc->pdev, IORESOURCE_MEM, 0);

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

	dispc->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dispc->base)) {

		r = PTR_ERR(dispc->base);

		goto err_free;

drivers/gpu/drm/omapdrm/dss/dsi.c

+2 −5
Original line number Diff line number Diff line
@@ -4884,7 +4884,6 @@ static int dsi_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct dsi_data *dsi;

	struct resource *dsi_mem;

	struct resource *res;

	unsigned int i;

	int r;
@@ -4921,13 +4920,11 @@ static int dsi_probe(struct platform_device *pdev) 
	if (IS_ERR(dsi->proto_base))

		return PTR_ERR(dsi->proto_base);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");

	dsi->phy_base = devm_ioremap_resource(dev, res);

	dsi->phy_base = devm_platform_ioremap_resource_byname(pdev, "phy");

	if (IS_ERR(dsi->phy_base))

		return PTR_ERR(dsi->phy_base);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");

	dsi->pll_base = devm_ioremap_resource(dev, res);

	dsi->pll_base = devm_platform_ioremap_resource_byname(pdev, "pll");

	if (IS_ERR(dsi->pll_base))

		return PTR_ERR(dsi->pll_base);

drivers/gpu/drm/omapdrm/dss/dss.c

+1 −3
Original line number Diff line number Diff line
@@ -1424,7 +1424,6 @@ static int dss_probe(struct platform_device *pdev) 
	const struct soc_device_attribute *soc;

	struct dss_component_match_data cmatch;

	struct component_match *match = NULL;

	struct resource *dss_mem;

	struct dss_device *dss;

	int r;
@@ -1452,8 +1451,7 @@ static int dss_probe(struct platform_device *pdev) 
		dss->feat = of_match_device(dss_of_match, &pdev->dev)->data;



	/* Map I/O registers, get and setup clocks. */

	dss_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	dss->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dss->base)) {

		r = PTR_ERR(dss->base);

		goto err_free_dss;

drivers/gpu/drm/omapdrm/dss/hdmi4_core.c

+1 −3
Original line number Diff line number Diff line
@@ -870,7 +870,6 @@ static const struct soc_device_attribute hdmi4_soc_devices[] = { 
int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)

{

	const struct hdmi4_features *features;

	struct resource *res;

	const struct soc_device_attribute *soc;



	soc = soc_device_match(hdmi4_soc_devices);
@@ -881,8 +880,7 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core) 
	core->cts_swmode = features->cts_swmode;

	core->audio_use_mclk = features->audio_use_mclk;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");

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

	core->base = devm_platform_ioremap_resource_byname(pdev, "core");

	if (IS_ERR(core->base))

		return PTR_ERR(core->base);

drivers/gpu/drm/omapdrm/dss/hdmi5_core.c

+1 −4
Original line number Diff line number Diff line
@@ -872,10 +872,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, 


int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)

{

	struct resource *res;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");

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

	core->base = devm_platform_ioremap_resource_byname(pdev, "core");

	if (IS_ERR(core->base))

		return PTR_ERR(core->base);