Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'acpi-driver-core' 

* acpi-driver-core:
  ACPI / AC: Remove struct acpi_device pointer from struct acpi_ac
  spi: Use stable dev_name for ACPI enumerated SPI slaves
  i2c: Use stable dev_name for ACPI enumerated I2C slaves
  ACPI: Provide acpi_dev_name accessor for struct acpi_device device name
  ACPI / bind: Use (put|get)_device() on ACPI device objects too
  ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
  ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
parents 2f466d33 86b0cc12

arch/ia64/hp/common/sba_iommu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1992,7 +1992,7 @@ sba_connect_bus(struct pci_bus *bus) 
	if (PCI_CONTROLLER(bus)->iommu)

	if (PCI_CONTROLLER(bus)->iommu)

		return;

		return;





	handle = PCI_CONTROLLER(bus)->acpi_handle;

	handle = acpi_device_handle(PCI_CONTROLLER(bus)->companion);

	if (!handle)

	if (!handle)

		return;

		return;

arch/ia64/include/asm/pci.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ struct iospace_resource { 
};

};





struct pci_controller {

struct pci_controller {

	void *acpi_handle;

	struct acpi_device *companion;

	void *iommu;

	void *iommu;

	int segment;

	int segment;

	int node;		/* nearest node with memory or -1 for global allocation */

	int node;		/* nearest node with memory or -1 for global allocation */

arch/ia64/pci/pci.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -436,9 +436,9 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	if (!controller)

	if (!controller)

		return NULL;

		return NULL;





	controller->acpi_handle = device->handle;

	controller->companion = device;





	pxm = acpi_get_pxm(controller->acpi_handle);

	pxm = acpi_get_pxm(device->handle);

#ifdef CONFIG_NUMA

#ifdef CONFIG_NUMA

	if (pxm >= 0)

	if (pxm >= 0)

		controller->node = pxm_to_node(pxm);

		controller->node = pxm_to_node(pxm);
@@ -489,7 +489,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) 
{

{

	struct pci_controller *controller = bridge->bus->sysdata;

	struct pci_controller *controller = bridge->bus->sysdata;





	ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle);

	ACPI_COMPANION_SET(&bridge->dev, controller->companion);

	return 0;

	return 0;

}

}

arch/ia64/sn/kernel/io_acpi_init.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ sn_get_bussoft_ptr(struct pci_bus *bus) 
	struct acpi_resource_vendor_typed *vendor;

	struct acpi_resource_vendor_typed *vendor;









	handle = PCI_CONTROLLER(bus)->acpi_handle;

	handle = acpi_device_handle(PCI_CONTROLLER(bus)->companion);

	status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,

	status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,

					  &sn_uuid, &buffer);

					  &sn_uuid, &buffer);

	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status)) {
@@ -360,7 +360,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, 
	acpi_status status;

	acpi_status status;

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };





	rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;

	rootbus_handle = acpi_device_handle(PCI_CONTROLLER(dev)->companion);

        status = acpi_evaluate_integer(rootbus_handle, METHOD_NAME__SEG, NULL,

        status = acpi_evaluate_integer(rootbus_handle, METHOD_NAME__SEG, NULL,

                                       &segment);

                                       &segment);

        if (ACPI_SUCCESS(status)) {

        if (ACPI_SUCCESS(status)) {

arch/x86/include/asm/pci.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ struct pci_sysdata { 
	int		domain;		/* PCI domain */

	int		domain;		/* PCI domain */

	int		node;		/* NUMA node */

	int		node;		/* NUMA node */

#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

	void		*acpi;		/* ACPI-specific data */

	struct acpi_device *companion;	/* ACPI companion device */

#endif

#endif

#ifdef CONFIG_X86_64

#ifdef CONFIG_X86_64

	void		*iommu;		/* IOMMU private data */

	void		*iommu;		/* IOMMU private data */