misc/pvpanic : break dependency on ACPI

The pvpanic driver is available for architectures that do not
support ACPI.So break the dependency.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 64c898a..642626a 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -515,7 +515,7 @@ config MISC_RTSX
 
 config PVPANIC
        tristate "pvpanic device support"
-       depends on ACPI
+       depends on ACPI || OF
        help
          This driver provides support for the pvpanic device.  pvpanic is
          a paravirtualized device provided by QEMU; it lets a virtual machine

diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c
index eabb53d..aab06b8 100644 (file)
--- a/drivers/misc/pvpanic.c
+++ b/drivers/misc/pvpanic.c
@@ -57,6 +57,7 @@ static struct notifier_block pvpanic_panic_nb = {
        .priority = 1, /* let this called before broken drm_fb_helper */
 };
 
+#ifdef CONFIG_ACPI
 static int pvpanic_add(struct acpi_device *device);
 static int pvpanic_remove(struct acpi_device *device);
 
@@ -126,6 +127,24 @@ static int pvpanic_remove(struct acpi_device *device)
        return 0;
 }
 
+static int pvpanic_register_acpi_driver(void)
+{
+       return acpi_bus_register_driver(&pvpanic_driver);
+}
+
+static void pvpanic_unregister_acpi_driver(void)
+{
+       acpi_bus_unregister_driver(&pvpanic_driver);
+}
+#else
+static int pvpanic_register_acpi_driver(void)
+{
+       return -ENODEV;
+}
+
+static void pvpanic_unregister_acpi_driver(void) {}
+#endif
+
 static int pvpanic_mmio_probe(struct platform_device *pdev)
 {
        struct resource *mem;
@@ -172,7 +191,7 @@ static int __init pvpanic_mmio_init(void)
        if (acpi_disabled)
                return platform_driver_register(&pvpanic_mmio_driver);
        else
-               return acpi_bus_register_driver(&pvpanic_driver);
+               return pvpanic_register_acpi_driver();
 }
 
 static void __exit pvpanic_mmio_exit(void)
@@ -180,7 +199,7 @@ static void __exit pvpanic_mmio_exit(void)
        if (acpi_disabled)
                platform_driver_unregister(&pvpanic_mmio_driver);
        else
-               acpi_bus_unregister_driver(&pvpanic_driver);
+               pvpanic_unregister_acpi_driver();
 }
 
 module_init(pvpanic_mmio_init);