Commit d4cb82aa authored by Cai Huoqing's avatar Cai Huoqing Committed by Neil Armstrong
Browse files

drm/meson: 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 avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210831135644.4576-1-caihuoqing@baidu.com
parent 9eeb7b4e

drivers/gpu/drm/meson/meson_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) 
	priv->compat = match->compat;

	priv->afbcd.ops = match->afbcd_ops;



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

	regs = devm_ioremap_resource(dev, res);

	regs = devm_platform_ioremap_resource_byname(pdev, "vpu");

	if (IS_ERR(regs)) {

		ret = PTR_ERR(regs);

		goto free_drm;

drivers/gpu/drm/meson/meson_dw_hdmi.c

+1 −3
Original line number Diff line number Diff line
@@ -978,7 +978,6 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, 
	struct dw_hdmi_plat_data *dw_plat_data;

	struct drm_bridge *next_bridge;

	struct drm_encoder *encoder;

	struct resource *res;

	int irq;

	int ret;
@@ -1042,8 +1041,7 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, 
		return PTR_ERR(meson_dw_hdmi->hdmitx_phy);

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	meson_dw_hdmi->hdmitx = devm_ioremap_resource(dev, res);

	meson_dw_hdmi->hdmitx = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(meson_dw_hdmi->hdmitx))

		return PTR_ERR(meson_dw_hdmi->hdmitx);