Merge branch 'pnp'

* pnp:
  PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c
  drivers/pnp/pnpbios: remove depends on CONFIG_EXPERIMENTAL

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 72e822e17d47..8813fc03aa09 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -90,7 +90,7 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
         pnp_dbg(&dev->dev, "set resources\n");
 
         handle = DEVICE_ACPI_HANDLE(&dev->dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+        if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
                 dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
                 return -ENODEV;
         }
@@ -123,7 +123,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
         dev_dbg(&dev->dev, "disable resources\n");
 
         handle = DEVICE_ACPI_HANDLE(&dev->dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+        if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
                 dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
                 return 0;
         }
@@ -145,7 +145,7 @@ static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
         acpi_handle handle;
 
         handle = DEVICE_ACPI_HANDLE(&dev->dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+        if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
                 dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
                 return false;
         }
@@ -160,7 +160,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
         int error = 0;
 
         handle = DEVICE_ACPI_HANDLE(&dev->dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+        if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
                 dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
                 return 0;
         }
@@ -197,7 +197,7 @@ static int pnpacpi_resume(struct pnp_dev *dev)
         acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
         int error = 0;
 
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+        if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
                 dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
                 return -ENODEV;
         }
diff --git a/drivers/pnp/pnpbios/Kconfig b/drivers/pnp/pnpbios/Kconfig
index b986d9fa3b9a..50c3dd065e03 100644
--- a/drivers/pnp/pnpbios/Kconfig
+++ b/drivers/pnp/pnpbios/Kconfig
@@ -2,8 +2,8 @@
 # Plug and Play BIOS configuration
 #
 config PNPBIOS
-        bool "Plug and Play BIOS support (EXPERIMENTAL)"
-        depends on ISA && X86 && EXPERIMENTAL
+        bool "Plug and Play BIOS support"
+        depends on ISA && X86
         default n
         ---help---
           Linux uses the PNPBIOS as defined in "Plug and Play BIOS