Skip to contentSkip to conversation

firmware: dcdbas: include linux/io.h

PATCH Applied Arnd Bergmann 2 participants 2 messages Oct 2, 2018 – Oct 3, 2018 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: dcdbas: include linux/io.h

memremap() is declared in linux/io.h, not in asm/io.h, so we should include that header to avoid build errors:

drivers/platform/x86/dcdbas.c: In function 'dcdbas_check_wsmt':
drivers/platform/x86/dcdbas.c:572:15: error: implicit declaration of function 'memremap'; did you mean 'ioremap'? [-Werror=implicit-function-declaration]

  eps_buffer = memremap(eps->smm_comm_buff_addr, remap_size, MEMREMAP_WB);
               ^~~~~~~~
               ioremap
drivers/platform/x86/dcdbas.c:572:61: error: 'MEMREMAP_WB' undeclared (first use in this function)
  eps_buffer = memremap(eps->smm_comm_buff_addr, remap_size, MEMREMAP_WB);
                                                             ^~~~~~~~~~~

drivers/platform/x86/dcdbas.c:572:61: note: each undeclared identifier is reported only once for each function it appears in drivers/platform/x86/dcdbas.c: In function 'dcdbas_exit':
drivers/platform/x86/dcdbas.c:748:3: error: implicit declaration of function 'memunmap'; did you mean 'vm_munmap'? [-Werror=implicit-function-declaration]

Fixes 12c956c4f32e ("firmware: dcdbas: Add support for WSMT ACPI table")
---
 drivers/platform/x86/dcdbas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/dcdbas.c +1 -1
index ae28e48ff7dc..daa7e3574568 100644
@@ -37,7 +37,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include "dcdbas.h"
 
Signature · 1 line
2.18.0
#1 lore raw
Quoted 12 lines · Arnd Bergmann

memremap() is declared in linux/io.h, not in asm/io.h, so we should include that header to avoid build errors:

drivers/platform/x86/dcdbas.c: In function 'dcdbas_check_wsmt':
drivers/platform/x86/dcdbas.c:572:15: error: implicit declaration of function 'memremap'; did you mean 'ioremap'? [-Werror=implicit-function-declaration]

  eps_buffer = memremap(eps->smm_comm_buff_addr, remap_size, MEMREMAP_WB);
               ^~~~~~~~
               ioremap
drivers/platform/x86/dcdbas.c:572:61: error: 'MEMREMAP_WB' undeclared (first use in this function)
  eps_buffer = memremap(eps->smm_comm_buff_addr, remap_size, MEMREMAP_WB);
                                                             ^~~~~~~~~~~
Quoted 4 lines

drivers/platform/x86/dcdbas.c:572:61: note: each undeclared identifier is reported only once for each function it appears in drivers/platform/x86/dcdbas.c: In function 'dcdbas_exit':
drivers/platform/x86/dcdbas.c:748:3: error: implicit declaration of function 'memunmap'; did you mean 'vm_munmap'? [-Werror=implicit-function-declaration]

Pushed to for-next, sorry for inconveniences and thanks for the quick fix!

Quoted 22 lines
Fixes 12c956c4f32e ("firmware: dcdbas: Add support for WSMT ACPI table")
---
 drivers/platform/x86/dcdbas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/dcdbas.c +1 -2
index ae28e48ff7dc..daa7e3574568 100644
@@ -37,7 +37,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include "dcdbas.h"
 
--

2.18.0

Signature · 2 lines
With Best Regards,
Andy Shevchenko