[2/2] vgaarb: avoid -Wempty-body warnings

Message ID 20210322105307.1291840-2-arnd@kernel.org
State New
Headers show
Series
  • [1/2] fbdev: omapfb: avoid -Wempty-body warning
Related show

Commit Message

Arnd Bergmann March 22, 2021, 10:53 a.m.
From: Arnd Bergmann <arnd@arndb.de>


Building with W=1 shows a few warnings for an empty macro:

drivers/gpu/drm/qxl/qxl_drv.c: In function 'qxl_pci_probe':
drivers/gpu/drm/qxl/qxl_drv.c:131:50: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
  131 |                 vga_put(pdev, VGA_RSRC_LEGACY_IO);
      |                                                  ^
drivers/gpu/drm/qxl/qxl_drv.c: In function 'qxl_pci_remove':
drivers/gpu/drm/qxl/qxl_drv.c:159:50: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
  159 |                 vga_put(pdev, VGA_RSRC_LEGACY_IO);

Change this to an inline function to make it more robust and avoid
the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 include/linux/vgaarb.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.29.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Daniel Vetter March 22, 2021, 1:59 p.m. | #1
On Mon, Mar 22, 2021 at 11:53:00AM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>

> 

> Building with W=1 shows a few warnings for an empty macro:

> 

> drivers/gpu/drm/qxl/qxl_drv.c: In function 'qxl_pci_probe':

> drivers/gpu/drm/qxl/qxl_drv.c:131:50: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]

>   131 |                 vga_put(pdev, VGA_RSRC_LEGACY_IO);

>       |                                                  ^

> drivers/gpu/drm/qxl/qxl_drv.c: In function 'qxl_pci_remove':

> drivers/gpu/drm/qxl/qxl_drv.c:159:50: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]

>   159 |                 vga_put(pdev, VGA_RSRC_LEGACY_IO);

> 

> Change this to an inline function to make it more robust and avoid

> the warning.

> 

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Both applied to drm-misc-next for 5.13, thanks for your patches.
-Daniel

> ---

>  include/linux/vgaarb.h | 4 +++-

>  1 file changed, 3 insertions(+), 1 deletion(-)

> 

> diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h

> index fc6dfeba04a5..dc6ddce92066 100644

> --- a/include/linux/vgaarb.h

> +++ b/include/linux/vgaarb.h

> @@ -112,7 +112,9 @@ static inline int vga_get_uninterruptible(struct pci_dev *pdev,

>  #if defined(CONFIG_VGA_ARB)

>  extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);

>  #else

> -#define vga_put(pdev, rsrc)

> +static inline void vga_put(struct pci_dev *pdev, unsigned int rsrc)

> +{

> +}

>  #endif

>  

>  

> -- 

> 2.29.2

> 


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index fc6dfeba04a5..dc6ddce92066 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -112,7 +112,9 @@  static inline int vga_get_uninterruptible(struct pci_dev *pdev,
 #if defined(CONFIG_VGA_ARB)
 extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
 #else
-#define vga_put(pdev, rsrc)
+static inline void vga_put(struct pci_dev *pdev, unsigned int rsrc)
+{
+}
 #endif