Skip to contentSkip to conversation

misc: pvpanic: fix warning implicit declaration

PATCH New Anders Roxell 1 participant 1 message Jan 11, 2019 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 misc: pvpanic: fix warning implicit declaration

When building and have fragment CONFIG_NO_IOPORT_MAP enabled then the following warning:

../drivers/misc/pvpanic.c: In function ‘pvpanic_walk_resources’:
../drivers/misc/pvpanic.c:73:10: error: implicit declaration of
function ‘ioport_map’; did you mean ‘ioremap’? [-Werror=implicit-function-declaration]

   base = ioport_map(r.start, resource_size(&r));
          ^~~~~~~~~~

Since commmit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set"), its now possible to have ACPI enabled without haveing PCI enabled. However, the pvpanic driver depends on HAS_IOPORT_MAP or HAVE_IOREMAP_PROT when ACPI is enabled. It was fine until commit 725eba2928ad ("misc/pvpanic: add MMIO support") got added. Rework so that we do a extra check ifdef CONFIG_HAS_IOPORT_MAP.

---
 drivers/misc/pvpanic.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/misc/pvpanic.c +4 -0
index 595ac065b401..95ff7c5a1dfb 100644
@@ -70,8 +70,12 @@ pvpanic_walk_resources(struct acpi_resource *res, void *context)
 	struct resource r;
 
 	if (acpi_dev_resource_io(res, &r)) {
+#ifdef CONFIG_HAS_IOPORT_MAP
 		base = ioport_map(r.start, resource_size(&r));
 		return AE_OK;
+#else
+		return AE_ERROR;
+#endif
 	} else if (acpi_dev_resource_memory(res, &r)) {
 		base = ioremap(r.start, resource_size(&r));
 		return AE_OK;
Signature · 1 line
2.19.2