summaryrefslogtreecommitdiff
path: root/include/linux/vgaarb.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-03-22 13:53:00 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2021-03-22 17:02:14 +0300
commit458025f6c16188a9f28219578448fac24b2cd487 (patch)
tree72313971ab1cbc746fda511d8cd0d3d8c9641bb1 /include/linux/vgaarb.h
parent84c41184cfa35232d7abbf087915fcbcb86e6a17 (diff)
downloadlinux-458025f6c16188a9f28219578448fac24b2cd487.tar.xz
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: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20210322105307.1291840-2-arnd@kernel.org
Diffstat (limited to 'include/linux/vgaarb.h')
-rw-r--r--include/linux/vgaarb.h4
1 files changed, 3 insertions, 1 deletions
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