Re: [PATCH v2] drm/hisilicon: Fixed the warning: Assignment of 0/1 to bool variable

[Thomas Zimmermann]

Hi

Am 07.07.20 um 04:58 schrieb Tian Tao:
> 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.
> 
> Signed-off-by: Tian Tao <tiant...@hisilicon.com>
> ---
>  drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +++---
>  drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 -
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c 
> b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> index 249c298..83c7bb5 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> @@ -254,7 +254,7 @@ static int hibmc_unload(struct drm_device *dev)
>  
>       if (dev->irq_enabled)
>               drm_irq_uninstall(dev);
> -     if (priv->msi_enabled)
> +     if (dev->pdev->msi_enabled)

You don't need these tests and you don't have to set
dev->pdev->msi_enabled by yourself. Just call pci_enable_msi() and
pci_disable_msi() and they should do the right thing.

Best regards
Thomas

>               pci_disable_msi(dev->pdev);
>  
>       hibmc_kms_fini(priv);
> @@ -294,12 +294,12 @@ static int hibmc_load(struct drm_device *dev)
>               goto err;
>       }
>  
> -     priv->msi_enabled = 0;
> +     dev->pdev->msi_enabled = 0;
>       ret = pci_enable_msi(dev->pdev);
>       if (ret) {
>               DRM_WARN("enabling MSI failed: %d\n", ret);
>       } else {
> -             priv->msi_enabled = 1;
> +             dev->pdev->msi_enabled = 1;
>               ret = drm_irq_install(dev, dev->pdev->irq);
>               if (ret)
>                       DRM_WARN("install irq failed: %d\n", ret);
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h 
> b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> index 6097687..a683763 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> @@ -25,7 +25,6 @@ struct hibmc_drm_private {
>       void __iomem   *fb_map;
>       unsigned long  fb_base;
>       unsigned long  fb_size;
> -     bool msi_enabled;
>  
>       /* drm */
>       struct drm_device  *dev;
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

signature.asc
Description: OpenPGP digital signature