Commit b34bf8e3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 17b1639b cfc57557

drivers/pnp/pnpacpi/core.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

	}

drivers/pnp/pnpbios/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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