Skip to contentSkip to conversation

agp: define proper stubs for empty helpers

PATCH In review Arnd Bergmann 3 participants 3 messages Sep 20, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 agp: define proper stubs for empty helpers

From: Arnd Bergmann <[email protected]>

The empty unmap_page_from_agp() macro causes a warning when building with 'make W=1' on a couple of architectures:

drivers/char/agp/generic.c: In function 'agp_generic_destroy_page':
drivers/char/agp/generic.c:1265:28: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
1265 | unmap_page_from_agp(page);

Change the definitions to a 'do { } while (0)' construct to make these more reliable.

---
 arch/parisc/include/asm/agp.h  | 4 ++--
 arch/powerpc/include/asm/agp.h | 4 ++--
 arch/sparc/include/asm/agp.h   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
arch/parisc/include/asm/agp.h +2 -2
index cb04470e63d0..14ae54cfd368 100644
@@ -8,8 +8,8 @@
  *
  */
 
-#define map_page_into_agp(page)		/* nothing */
-#define unmap_page_from_agp(page)	/* nothing */
+#define map_page_into_agp(page)		do { } while (0)
+#define unmap_page_from_agp(page)	do { } while (0)
 #define flush_agp_cache()		mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
arch/powerpc/include/asm/agp.h +2 -2
index b29b1186f819..6b6485c988dd 100644
@@ -5,8 +5,8 @@
 
 #include <asm/io.h>
 
-#define map_page_into_agp(page)
-#define unmap_page_from_agp(page)
+#define map_page_into_agp(page) do {} while (0)
+#define unmap_page_from_agp(page) do {} while (0)
 #define flush_agp_cache() mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
arch/sparc/include/asm/agp.h +3 -3
index efe0d6a12e5a..2d0ff84cee3f 100644
@@ -4,9 +4,9 @@
 
 /* dummy for now */
 
-#define map_page_into_agp(page)
-#define unmap_page_from_agp(page)
-#define flush_agp_cache() mb()
+#define map_page_into_agp(page)		do { } while (0)
+#define unmap_page_from_agp(page)	do { } while (0)
+#define flush_agp_cache()		mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
 #define alloc_gatt_pages(order)		\
Signature · 1 line
2.29.2
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The empty unmap_page_from_agp() macro causes a warning when building with 'make W=1' on a couple of architectures:

Quoted 8 lines

drivers/char/agp/generic.c: In function 'agp_generic_destroy_page':
drivers/char/agp/generic.c:1265:28: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
1265 | unmap_page_from_agp(page);

Change the definitions to a 'do { } while (0)' construct to make these more reliable.

Looks good.

Sam

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The empty unmap_page_from_agp() macro causes a warning when building with 'make W=1' on a couple of architectures:

Quoted 8 lines

drivers/char/agp/generic.c: In function 'agp_generic_destroy_page':
drivers/char/agp/generic.c:1265:28: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
1265 | unmap_page_from_agp(page);

Change the definitions to a 'do { } while (0)' construct to make these more reliable.

Thanks,
Helge

Quoted 54 lines
---
  arch/parisc/include/asm/agp.h  | 4 ++--
  arch/powerpc/include/asm/agp.h | 4 ++--
  arch/sparc/include/asm/agp.h   | 6 +++---
  3 files changed, 7 insertions(+), 7 deletions(-)
arch/parisc/include/asm/agp.h +2 -2
index cb04470e63d0..14ae54cfd368 100644
@@ -8,8 +8,8 @@
   *
   */
 
-#define map_page_into_agp(page)		/* nothing */
-#define unmap_page_from_agp(page)	/* nothing */
+#define map_page_into_agp(page)		do { } while (0)
+#define unmap_page_from_agp(page)	do { } while (0)
  #define flush_agp_cache()		mb()
 
  /* GATT allocation. Returns/accepts GATT kernel virtual address. */
arch/powerpc/include/asm/agp.h +2 -2
index b29b1186f819..6b6485c988dd 100644
@@ -5,8 +5,8 @@
 
  #include <asm/io.h>
 
-#define map_page_into_agp(page)
-#define unmap_page_from_agp(page)
+#define map_page_into_agp(page) do {} while (0)
+#define unmap_page_from_agp(page) do {} while (0)
  #define flush_agp_cache() mb()
 
  /* GATT allocation. Returns/accepts GATT kernel virtual address. */
arch/sparc/include/asm/agp.h +3 -3
index efe0d6a12e5a..2d0ff84cee3f 100644
@@ -4,9 +4,9 @@
 
  /* dummy for now */
 
-#define map_page_into_agp(page)
-#define unmap_page_from_agp(page)
-#define flush_agp_cache() mb()
+#define map_page_into_agp(page)		do { } while (0)
+#define unmap_page_from_agp(page)	do { } while (0)
+#define flush_agp_cache()		mb()
 
  /* GATT allocation. Returns/accepts GATT kernel virtual address. */
  #define alloc_gatt_pages(order)		\