Commit 295a7f62 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'acpi-scan' of... 

Merge branch 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into pci/yinghai-survey-resources+acpi-scan

* 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / scan: Treat power resources in a special way
  ACPI: Remove unused struct acpi_pci_root.id member
  ACPI: Drop ACPI device .bind() and .unbind() callbacks
  ACPI / PCI: Move the _PRT setup and cleanup code to pci-acpi.c
  ACPI / PCI: Rework the setup and cleanup of device wakeup
  ACPI: Add .setup() and .cleanup() callbacks to struct acpi_bus_type
  ACPI: Make acpi_bus_scan() and acpi_bus_add() take only one argument
  ACPI: Replace ACPI device add_type field with a match_driver flag
  ACPI: Drop the second argument of acpi_bus_scan()
  ACPI: Remove the arguments of acpi_bus_add() that are not used
  ACPI: Remove acpi_start_single_object() and acpi_bus_start()
  ACPI / PCI: Fold acpi_pci_root_start() into acpi_pci_root_add()
  ACPI: Change the ordering of acpi_bus_check_add()
  ACPI: Replace struct acpi_bus_ops with enum type
  ACPI: Reduce the usage of struct acpi_bus_ops
  ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different
  ACPI: Change the ordering of PCI root bridge driver registrarion
  ACPI: Separate adding ACPI device objects from probing ACPI drivers

Conflicts:
	drivers/acpi/pci_root.c
parents b3e65e1f f95988de

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ acpi-y += resource.o 
acpi-y				+= processor_core.o

acpi-y				+= ec.o

acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o

acpi-y				+= acpi_platform.o

acpi-y				+= power.o

acpi-y				+= event.o

drivers/acpi/acpi_memhotplug.c

+6 −18
Original line number Diff line number Diff line
@@ -157,38 +157,26 @@ static int 
acpi_memory_get_device(acpi_handle handle,

		       struct acpi_memory_device **mem_device)

{

	acpi_status status;

	acpi_handle phandle;

	struct acpi_device *device = NULL;

	struct acpi_device *pdevice = NULL;

	int result;





	if (!acpi_bus_get_device(handle, &device) && device)

		goto end;



	status = acpi_get_parent(handle, &phandle);

	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "Cannot find acpi parent"));

		return -EINVAL;

	}



	/* Get the parent device */

	result = acpi_bus_get_device(phandle, &pdevice);

	if (result) {

		acpi_handle_warn(phandle, "Cannot get acpi bus device\n");

		return -EINVAL;

	}



	/*

	 * Now add the notified device.  This creates the acpi_device

	 * and invokes .add function

	 */

	result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);

	result = acpi_bus_add(handle);

	if (result) {

		acpi_handle_warn(handle, "Cannot add acpi bus\n");

		return -EINVAL;

	}

	result = acpi_bus_get_device(handle, &device);

	if (result) {

		acpi_handle_warn(handle, "Missing device object\n");

		return -EINVAL;

	}



      end:

	*mem_device = acpi_driver_data(device);

drivers/acpi/container.c

+6 −25
Original line number Diff line number Diff line
@@ -135,30 +135,6 @@ static int acpi_container_remove(struct acpi_device *device, int type) 
	return status;

}



static int container_device_add(struct acpi_device **device, acpi_handle handle)

{

	acpi_handle phandle;

	struct acpi_device *pdev;

	int result;





	if (acpi_get_parent(handle, &phandle)) {

		return -ENODEV;

	}



	if (acpi_bus_get_device(phandle, &pdev)) {

		return -ENODEV;

	}



	if (acpi_bus_add(device, pdev, handle, ACPI_BUS_TYPE_DEVICE)) {

		return -ENODEV;

	}



	result = acpi_bus_start(*device);



	return result;

}



static void container_notify_cb(acpi_handle handle, u32 type, void *context)

{

	struct acpi_device *device = NULL;
@@ -190,11 +166,16 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context) 
		if (!ACPI_FAILURE(status) || device)

			break;



		result = container_device_add(&device, handle);

		result = acpi_bus_add(handle);

		if (result) {

			acpi_handle_warn(handle, "Failed to add container\n");

			break;

		}

		result = acpi_bus_get_device(handle, &device);

		if (result) {

			acpi_handle_warn(handle, "Missing device object\n");

			break;

		}



		kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);

		ost_code = ACPI_OST_SC_SUCCESS;

drivers/acpi/device_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable) 
 * acpi_dev_pm_get_node - Get ACPI device node for the given physical device.

 * @dev: Device to get the ACPI node for.

 */

static struct acpi_device *acpi_dev_pm_get_node(struct device *dev)

struct acpi_device *acpi_dev_pm_get_node(struct device *dev)

{

	acpi_handle handle = DEVICE_ACPI_HANDLE(dev);

	struct acpi_device *adev;

drivers/acpi/dock.c

+4 −11
Original line number Diff line number Diff line
@@ -310,8 +310,6 @@ static int dock_present(struct dock_station *ds) 
static struct acpi_device * dock_create_acpi_device(acpi_handle handle)

{

	struct acpi_device *device;

	struct acpi_device *parent_device;

	acpi_handle parent;

	int ret;



	if (acpi_bus_get_device(handle, &device)) {
@@ -319,16 +317,11 @@ static struct acpi_device * dock_create_acpi_device(acpi_handle handle) 
		 * no device created for this object,

		 * so we should create one.

		 */

		acpi_get_parent(handle, &parent);

		if (acpi_bus_get_device(parent, &parent_device))

			parent_device = NULL;



		ret = acpi_bus_add(&device, parent_device, handle,

			ACPI_BUS_TYPE_DEVICE);

		if (ret) {

		ret = acpi_bus_add(handle);

		if (ret)

			pr_debug("error adding bus, %x\n", -ret);

			return NULL;

		}



		acpi_bus_get_device(handle, &device);

	}

	return device;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE