Unverified Commit f5df171f authored by Cai Huoqing's avatar Cai Huoqing Committed by Maxime Ripard
Browse files

drm/sun4i: Make use of the helper function devm_platform_ioremap_resource() 



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 avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210831135740.4826-1-caihuoqing@baidu.com
parent 23019ff2

drivers/gpu/drm/sun4i/sun4i_backend.c

+1 −3
Original line number Diff line number Diff line
@@ -782,7 +782,6 @@ static int sun4i_backend_bind(struct device *dev, struct device *master, 
	struct sun4i_drv *drv = drm->dev_private;

	struct sun4i_backend *backend;

	const struct sun4i_backend_quirks *quirks;

	struct resource *res;

	void __iomem *regs;

	int i, ret;
@@ -815,8 +814,7 @@ static int sun4i_backend_bind(struct device *dev, struct device *master, 
	if (IS_ERR(backend->frontend))

		dev_warn(dev, "Couldn't find matching frontend, frontend features disabled\n");



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(dev, res);

	regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

drivers/gpu/drm/sun4i/sun4i_frontend.c

+1 −3
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ static int sun4i_frontend_bind(struct device *dev, struct device *master, 
	struct sun4i_frontend *frontend;

	struct drm_device *drm = data;

	struct sun4i_drv *drv = drm->dev_private;

	struct resource *res;

	void __iomem *regs;



	frontend = devm_kzalloc(dev, sizeof(*frontend), GFP_KERNEL);
@@ -576,8 +575,7 @@ static int sun4i_frontend_bind(struct device *dev, struct device *master, 
	if (!frontend->data)

		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(dev, res);

	regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+1 −3
Original line number Diff line number Diff line
@@ -489,7 +489,6 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master, 
	struct cec_connector_info conn_info;

	struct sun4i_drv *drv = drm->dev_private;

	struct sun4i_hdmi *hdmi;

	struct resource *res;

	u32 reg;

	int ret;
@@ -504,8 +503,7 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master, 
	if (!hdmi->variant)

		return -EINVAL;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	hdmi->base = devm_ioremap_resource(dev, res);

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

	if (IS_ERR(hdmi->base)) {

		dev_err(dev, "Couldn't map the HDMI encoder registers\n");

		return PTR_ERR(hdmi->base);

drivers/gpu/drm/sun4i/sun4i_tcon.c

+1 −3
Original line number Diff line number Diff line
@@ -841,11 +841,9 @@ static int sun4i_tcon_init_regmap(struct device *dev, 
				  struct sun4i_tcon *tcon)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct resource *res;

	void __iomem *regs;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(dev, res);

	regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

drivers/gpu/drm/sun4i/sun4i_tv.c

+1 −3
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, 
	struct drm_device *drm = data;

	struct sun4i_drv *drv = drm->dev_private;

	struct sun4i_tv *tv;

	struct resource *res;

	void __iomem *regs;

	int ret;
@@ -548,8 +547,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, 
	tv->drv = drv;

	dev_set_drvdata(dev, tv);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(dev, res);

	regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(regs)) {

		dev_err(dev, "Couldn't map the TV encoder registers\n");

		return PTR_ERR(regs);