Commit 389be500 authored by Tian Tao's avatar Tian Tao
Browse files

drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_drm_drv 



Use drm_err instead of DRM_ERROR in hibmc_drm_drv

Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1597829014-39942-5-git-send-email-tiantao6@hisilicon.com
parent e7187bab

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+12 −12
Original line number Diff line number Diff line
@@ -98,13 +98,13 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv) 


	ret = hibmc_de_init(priv);

	if (ret) {

		DRM_ERROR("failed to init de: %d\n", ret);

		drm_err(priv->dev, "failed to init de: %d\n", ret);

		return ret;

	}



	ret = hibmc_vdac_init(priv);

	if (ret) {

		DRM_ERROR("failed to init vdac: %d\n", ret);

		drm_err(priv->dev, "failed to init vdac: %d\n", ret);

		return ret;

	}
@@ -212,7 +212,7 @@ static int hibmc_hw_map(struct hibmc_drm_private *priv) 
	iosize = pci_resource_len(pdev, 1);

	priv->mmio = devm_ioremap(dev->dev, ioaddr, iosize);

	if (!priv->mmio) {

		DRM_ERROR("Cannot map mmio region\n");

		drm_err(dev, "Cannot map mmio region\n");

		return -ENOMEM;

	}
@@ -220,7 +220,7 @@ static int hibmc_hw_map(struct hibmc_drm_private *priv) 
	size = pci_resource_len(pdev, 0);

	priv->fb_map = devm_ioremap(dev->dev, addr, size);

	if (!priv->fb_map) {

		DRM_ERROR("Cannot map framebuffer\n");

		drm_err(dev, "Cannot map framebuffer\n");

		return -ENOMEM;

	}

	priv->fb_base = addr;
@@ -265,7 +265,7 @@ static int hibmc_load(struct drm_device *dev) 


	priv = drmm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		DRM_ERROR("no memory to allocate for hibmc_drm_private\n");

		drm_err(dev, "no memory to allocate for hibmc_drm_private\n");

		return -ENOMEM;

	}

	dev->dev_private = priv;
@@ -285,17 +285,17 @@ static int hibmc_load(struct drm_device *dev) 


	ret = drm_vblank_init(dev, dev->mode_config.num_crtc);

	if (ret) {

		DRM_ERROR("failed to initialize vblank: %d\n", ret);

		drm_err(dev, "failed to initialize vblank: %d\n", ret);

		goto err;

	}



	ret = pci_enable_msi(dev->pdev);

	if (ret) {

		DRM_WARN("enabling MSI failed: %d\n", ret);

		drm_warn(dev, "enabling MSI failed: %d\n", ret);

	} else {

		ret = drm_irq_install(dev, dev->pdev->irq);

		if (ret)

			DRM_WARN("install irq failed: %d\n", ret);

			drm_warn(dev, "install irq failed: %d\n", ret);

	}



	/* reset all the states of crtc/plane/encoder/connector */
@@ -305,7 +305,7 @@ static int hibmc_load(struct drm_device *dev) 


err:

	hibmc_unload(dev);

	DRM_ERROR("failed to initialize drm driver: %d\n", ret);

	drm_err(dev, "failed to initialize drm driver: %d\n", ret);

	return ret;

}
@@ -331,19 +331,19 @@ static int hibmc_pci_probe(struct pci_dev *pdev, 


	ret = pci_enable_device(pdev);

	if (ret) {

		DRM_ERROR("failed to enable pci device: %d\n", ret);

		drm_err(dev, "failed to enable pci device: %d\n", ret);

		goto err_free;

	}



	ret = hibmc_load(dev);

	if (ret) {

		DRM_ERROR("failed to load hibmc: %d\n", ret);

		drm_err(dev, "failed to load hibmc: %d\n", ret);

		goto err_disable;

	}



	ret = drm_dev_register(dev, 0);

	if (ret) {

		DRM_ERROR("failed to register drv for userspace access: %d\n",

		drm_err(dev, "failed to register drv for userspace access: %d\n",

			  ret);

		goto err_unload;

	}