Commit 458025f6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Daniel Vetter
Browse files

vgaarb: avoid -Wempty-body warnings 



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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210322105307.1291840-2-arnd@kernel.org
parent 84c41184

include/linux/vgaarb.h

+3 −1
Original line number Diff line number Diff line
@@ -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