Commit 85b3bfa2 authored by Tian Tao's avatar Tian Tao Committed by Thomas Zimmermann

drm/hisilicon: Fixed the warning: Assignment of 0/1 to bool variable

fixed the following warning:
hibmc_drm_drv.c:296:1-18:WARNING: Assignment of 0/1 to bool variable.
hibmc_drm_drv.c:301:2-19: WARNING: Assignment of 0/1 to bool variable.

v2:
using the pci_dev.msi_enabled instead of priv->msi_enabled.

v3:
just call pci_enable_msi() and pci_disable_msi(), it's no need to
set dev->pdev->msi_enabled again.
Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Reviewed-By: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1595940907-17874-1-git-send-email-tiantao6@hisilicon.com
parent 639abb72
...@@ -254,9 +254,8 @@ static int hibmc_unload(struct drm_device *dev) ...@@ -254,9 +254,8 @@ static int hibmc_unload(struct drm_device *dev)
if (dev->irq_enabled) if (dev->irq_enabled)
drm_irq_uninstall(dev); drm_irq_uninstall(dev);
if (priv->msi_enabled)
pci_disable_msi(dev->pdev);
pci_disable_msi(dev->pdev);
hibmc_kms_fini(priv); hibmc_kms_fini(priv);
hibmc_mm_fini(priv); hibmc_mm_fini(priv);
dev->dev_private = NULL; dev->dev_private = NULL;
...@@ -294,12 +293,10 @@ static int hibmc_load(struct drm_device *dev) ...@@ -294,12 +293,10 @@ static int hibmc_load(struct drm_device *dev)
goto err; goto err;
} }
priv->msi_enabled = 0;
ret = pci_enable_msi(dev->pdev); ret = pci_enable_msi(dev->pdev);
if (ret) { if (ret) {
DRM_WARN("enabling MSI failed: %d\n", ret); DRM_WARN("enabling MSI failed: %d\n", ret);
} else { } else {
priv->msi_enabled = 1;
ret = drm_irq_install(dev, dev->pdev->irq); ret = drm_irq_install(dev, dev->pdev->irq);
if (ret) if (ret)
DRM_WARN("install irq failed: %d\n", ret); DRM_WARN("install irq failed: %d\n", ret);
......
...@@ -25,7 +25,6 @@ struct hibmc_drm_private { ...@@ -25,7 +25,6 @@ struct hibmc_drm_private {
void __iomem *fb_map; void __iomem *fb_map;
unsigned long fb_base; unsigned long fb_base;
unsigned long fb_size; unsigned long fb_size;
bool msi_enabled;
/* drm */ /* drm */
struct drm_device *dev; struct drm_device *dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment