misc: pvpanic: fix warning implicit declaration

Message ID 20190111122525.21167-1-anders.roxell@linaro.org
State Accepted
Commit d8e346eb30372233063236edeb7600b92c92b287
Headers show
  • misc: pvpanic: fix warning implicit declaration
Related show

Commit Message

Anders Roxell Jan. 11, 2019, 12:25 p.m.
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’?
   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.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

 drivers/misc/pvpanic.c | 4 ++++
 1 file changed, 4 insertions(+)



diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c
index 595ac065b401..95ff7c5a1dfb 100644
--- a/drivers/misc/pvpanic.c
+++ b/drivers/misc/pvpanic.c
@@ -70,8 +70,12 @@  pvpanic_walk_resources(struct acpi_resource *res, void *context)
 	struct resource r;
 	if (acpi_dev_resource_io(res, &r)) {
 		base = ioport_map(r.start, resource_size(&r));
 		return AE_OK;
+		return AE_ERROR;
 	} else if (acpi_dev_resource_memory(res, &r)) {
 		base = ioremap(r.start, resource_size(&r));
 		return AE_OK;