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
This commit is contained in:
commit
a7d2472d81
|
@ -1992,7 +1992,7 @@ sba_connect_bus(struct pci_bus *bus)
|
|||
if (PCI_CONTROLLER(bus)->iommu)
|
||||
return;
|
||||
|
||||
handle = PCI_CONTROLLER(bus)->acpi_handle;
|
||||
handle = acpi_device_handle(PCI_CONTROLLER(bus)->companion);
|
||||
if (!handle)
|
||||
return;
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ struct iospace_resource {
|
|||
};
|
||||
|
||||
struct pci_controller {
|
||||
void *acpi_handle;
|
||||
struct acpi_device *companion;
|
||||
void *iommu;
|
||||
int segment;
|
||||
int node; /* nearest node with memory or -1 for global allocation */
|
||||
|
|
|
@ -436,9 +436,9 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
|
|||
if (!controller)
|
||||
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
|
||||
if (pxm >= 0)
|
||||
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;
|
||||
|
||||
ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle);
|
||||
ACPI_COMPANION_SET(&bridge->dev, controller->companion);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -132,7 +132,7 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
|
|||
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,
|
||||
&sn_uuid, &buffer);
|
||||
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;
|
||||
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,
|
||||
&segment);
|
||||
if (ACPI_SUCCESS(status)) {
|
||||
|
|
|
@ -15,7 +15,7 @@ struct pci_sysdata {
|
|||
int domain; /* PCI domain */
|
||||
int node; /* NUMA node */
|
||||
#ifdef CONFIG_ACPI
|
||||
void *acpi; /* ACPI-specific data */
|
||||
struct acpi_device *companion; /* ACPI companion device */
|
||||
#endif
|
||||
#ifdef CONFIG_X86_64
|
||||
void *iommu; /* IOMMU private data */
|
||||
|
|
|
@ -518,7 +518,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
|
|||
sd = &info->sd;
|
||||
sd->domain = domain;
|
||||
sd->node = node;
|
||||
sd->acpi = device->handle;
|
||||
sd->companion = device;
|
||||
/*
|
||||
* Maybe the desired pci bus has been already scanned. In such case
|
||||
* it is unnecessary to scan the pci bus with the given domain,busnum.
|
||||
|
@ -589,7 +589,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
|
|||
{
|
||||
struct pci_sysdata *sd = bridge->bus->sysdata;
|
||||
|
||||
ACPI_HANDLE_SET(&bridge->dev, sd->acpi);
|
||||
ACPI_COMPANION_SET(&bridge->dev, sd->companion);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -56,7 +56,6 @@ static int ac_sleep_before_get_state_ms;
|
|||
|
||||
struct acpi_ac {
|
||||
struct power_supply charger;
|
||||
struct acpi_device *adev;
|
||||
struct platform_device *pdev;
|
||||
unsigned long long state;
|
||||
};
|
||||
|
@ -70,8 +69,9 @@ struct acpi_ac {
|
|||
static int acpi_ac_get_state(struct acpi_ac *ac)
|
||||
{
|
||||
acpi_status status;
|
||||
acpi_handle handle = ACPI_HANDLE(&ac->pdev->dev);
|
||||
|
||||
status = acpi_evaluate_integer(ac->adev->handle, "_PSR", NULL,
|
||||
status = acpi_evaluate_integer(handle, "_PSR", NULL,
|
||||
&ac->state);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_EXCEPTION((AE_INFO, status,
|
||||
|
@ -119,6 +119,7 @@ static enum power_supply_property ac_props[] = {
|
|||
static void acpi_ac_notify_handler(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct acpi_ac *ac = data;
|
||||
struct acpi_device *adev;
|
||||
|
||||
if (!ac)
|
||||
return;
|
||||
|
@ -141,10 +142,11 @@ static void acpi_ac_notify_handler(acpi_handle handle, u32 event, void *data)
|
|||
msleep(ac_sleep_before_get_state_ms);
|
||||
|
||||
acpi_ac_get_state(ac);
|
||||
acpi_bus_generate_netlink_event(ac->adev->pnp.device_class,
|
||||
adev = ACPI_COMPANION(&ac->pdev->dev);
|
||||
acpi_bus_generate_netlink_event(adev->pnp.device_class,
|
||||
dev_name(&ac->pdev->dev),
|
||||
event, (u32) ac->state);
|
||||
acpi_notifier_call_chain(ac->adev, event, (u32) ac->state);
|
||||
acpi_notifier_call_chain(adev, event, (u32) ac->state);
|
||||
kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
|
||||
}
|
||||
|
||||
|
@ -178,8 +180,8 @@ static int acpi_ac_probe(struct platform_device *pdev)
|
|||
if (!pdev)
|
||||
return -EINVAL;
|
||||
|
||||
result = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
|
||||
if (result)
|
||||
adev = ACPI_COMPANION(&pdev->dev);
|
||||
if (!adev)
|
||||
return -ENODEV;
|
||||
|
||||
ac = kzalloc(sizeof(struct acpi_ac), GFP_KERNEL);
|
||||
|
@ -188,7 +190,6 @@ static int acpi_ac_probe(struct platform_device *pdev)
|
|||
|
||||
strcpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME);
|
||||
strcpy(acpi_device_class(adev), ACPI_AC_CLASS);
|
||||
ac->adev = adev;
|
||||
ac->pdev = pdev;
|
||||
platform_set_drvdata(pdev, ac);
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@ int acpi_create_platform_device(struct acpi_device *adev,
|
|||
pdevinfo.id = -1;
|
||||
pdevinfo.res = resources;
|
||||
pdevinfo.num_res = count;
|
||||
pdevinfo.acpi_node.handle = adev->handle;
|
||||
pdevinfo.acpi_node.companion = adev;
|
||||
pdev = platform_device_register_full(&pdevinfo);
|
||||
if (IS_ERR(pdev)) {
|
||||
dev_err(&adev->dev, "platform device creation failed: %ld\n",
|
||||
|
|
|
@ -22,16 +22,12 @@
|
|||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
*/
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/pm_qos.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
#include <acpi/acpi_bus.h>
|
||||
#include <acpi/acpi_drivers.h>
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
#define _COMPONENT ACPI_POWER_COMPONENT
|
||||
|
@ -548,7 +544,7 @@ static int acpi_dev_pm_get_state(struct device *dev, struct acpi_device *adev,
|
|||
*/
|
||||
int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in)
|
||||
{
|
||||
acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
|
||||
acpi_handle handle = ACPI_HANDLE(dev);
|
||||
struct acpi_device *adev;
|
||||
int ret, d_min, d_max;
|
||||
|
||||
|
@ -656,7 +652,7 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable)
|
|||
if (!device_run_wake(phys_dev))
|
||||
return -EINVAL;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(phys_dev);
|
||||
handle = ACPI_HANDLE(phys_dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &adev)) {
|
||||
dev_dbg(phys_dev, "ACPI handle without context in %s!\n",
|
||||
__func__);
|
||||
|
@ -700,7 +696,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
|
|||
if (!device_can_wakeup(dev))
|
||||
return -EINVAL;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(dev);
|
||||
handle = ACPI_HANDLE(dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &adev)) {
|
||||
dev_dbg(dev, "ACPI handle without context in %s!\n", __func__);
|
||||
return -ENODEV;
|
||||
|
@ -722,7 +718,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
|
|||
*/
|
||||
struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
|
||||
{
|
||||
acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
|
||||
acpi_handle handle = ACPI_HANDLE(dev);
|
||||
struct acpi_device *adev;
|
||||
|
||||
return handle && !acpi_bus_get_device(handle, &adev) ? adev : NULL;
|
||||
|
|
|
@ -197,30 +197,28 @@ static void acpi_physnode_link_name(char *buf, unsigned int node_id)
|
|||
|
||||
int acpi_bind_one(struct device *dev, acpi_handle handle)
|
||||
{
|
||||
struct acpi_device *acpi_dev;
|
||||
acpi_status status;
|
||||
struct acpi_device *acpi_dev = NULL;
|
||||
struct acpi_device_physical_node *physical_node, *pn;
|
||||
char physical_node_name[PHYSICAL_NODE_NAME_SIZE];
|
||||
struct list_head *physnode_list;
|
||||
unsigned int node_id;
|
||||
int retval = -EINVAL;
|
||||
|
||||
if (ACPI_HANDLE(dev)) {
|
||||
if (ACPI_COMPANION(dev)) {
|
||||
if (handle) {
|
||||
dev_warn(dev, "ACPI handle is already set\n");
|
||||
dev_warn(dev, "ACPI companion already set\n");
|
||||
return -EINVAL;
|
||||
} else {
|
||||
handle = ACPI_HANDLE(dev);
|
||||
acpi_dev = ACPI_COMPANION(dev);
|
||||
}
|
||||
} else {
|
||||
acpi_bus_get_device(handle, &acpi_dev);
|
||||
}
|
||||
if (!handle)
|
||||
if (!acpi_dev)
|
||||
return -EINVAL;
|
||||
|
||||
get_device(&acpi_dev->dev);
|
||||
get_device(dev);
|
||||
status = acpi_bus_get_device(handle, &acpi_dev);
|
||||
if (ACPI_FAILURE(status))
|
||||
goto err;
|
||||
|
||||
physical_node = kzalloc(sizeof(*physical_node), GFP_KERNEL);
|
||||
if (!physical_node) {
|
||||
retval = -ENOMEM;
|
||||
|
@ -242,10 +240,11 @@ int acpi_bind_one(struct device *dev, acpi_handle handle)
|
|||
|
||||
dev_warn(dev, "Already associated with ACPI node\n");
|
||||
kfree(physical_node);
|
||||
if (ACPI_HANDLE(dev) != handle)
|
||||
if (ACPI_COMPANION(dev) != acpi_dev)
|
||||
goto err;
|
||||
|
||||
put_device(dev);
|
||||
put_device(&acpi_dev->dev);
|
||||
return 0;
|
||||
}
|
||||
if (pn->node_id == node_id) {
|
||||
|
@ -259,8 +258,8 @@ int acpi_bind_one(struct device *dev, acpi_handle handle)
|
|||
list_add(&physical_node->node, physnode_list);
|
||||
acpi_dev->physical_node_count++;
|
||||
|
||||
if (!ACPI_HANDLE(dev))
|
||||
ACPI_HANDLE_SET(dev, acpi_dev->handle);
|
||||
if (!ACPI_COMPANION(dev))
|
||||
ACPI_COMPANION_SET(dev, acpi_dev);
|
||||
|
||||
acpi_physnode_link_name(physical_node_name, node_id);
|
||||
retval = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
|
||||
|
@ -283,27 +282,21 @@ int acpi_bind_one(struct device *dev, acpi_handle handle)
|
|||
return 0;
|
||||
|
||||
err:
|
||||
ACPI_HANDLE_SET(dev, NULL);
|
||||
ACPI_COMPANION_SET(dev, NULL);
|
||||
put_device(dev);
|
||||
put_device(&acpi_dev->dev);
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_bind_one);
|
||||
|
||||
int acpi_unbind_one(struct device *dev)
|
||||
{
|
||||
struct acpi_device *acpi_dev = ACPI_COMPANION(dev);
|
||||
struct acpi_device_physical_node *entry;
|
||||
struct acpi_device *acpi_dev;
|
||||
acpi_status status;
|
||||
|
||||
if (!ACPI_HANDLE(dev))
|
||||
if (!acpi_dev)
|
||||
return 0;
|
||||
|
||||
status = acpi_bus_get_device(ACPI_HANDLE(dev), &acpi_dev);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
dev_err(dev, "Oops, ACPI handle corrupt in %s()\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
mutex_lock(&acpi_dev->physical_node_lock);
|
||||
|
||||
list_for_each_entry(entry, &acpi_dev->physical_node_list, node)
|
||||
|
@ -316,9 +309,10 @@ int acpi_unbind_one(struct device *dev)
|
|||
acpi_physnode_link_name(physnode_name, entry->node_id);
|
||||
sysfs_remove_link(&acpi_dev->dev.kobj, physnode_name);
|
||||
sysfs_remove_link(&dev->kobj, "firmware_node");
|
||||
ACPI_HANDLE_SET(dev, NULL);
|
||||
/* acpi_bind_one() increase refcnt by one. */
|
||||
ACPI_COMPANION_SET(dev, NULL);
|
||||
/* Drop references taken by acpi_bind_one(). */
|
||||
put_device(dev);
|
||||
put_device(&acpi_dev->dev);
|
||||
kfree(entry);
|
||||
break;
|
||||
}
|
||||
|
@ -328,6 +322,15 @@ int acpi_unbind_one(struct device *dev)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_unbind_one);
|
||||
|
||||
void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr)
|
||||
{
|
||||
struct acpi_device *adev;
|
||||
|
||||
if (!acpi_bus_get_device(acpi_get_child(parent, addr), &adev))
|
||||
ACPI_COMPANION_SET(dev, adev);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_preset_companion);
|
||||
|
||||
static int acpi_platform_notify(struct device *dev)
|
||||
{
|
||||
struct acpi_bus_type *type = acpi_get_bus_type(dev);
|
||||
|
|
|
@ -185,7 +185,7 @@ void ata_acpi_bind_port(struct ata_port *ap)
|
|||
if (libata_noacpi || ap->flags & ATA_FLAG_ACPI_SATA || !host_handle)
|
||||
return;
|
||||
|
||||
ACPI_HANDLE_SET(&ap->tdev, acpi_get_child(host_handle, ap->port_no));
|
||||
acpi_preset_companion(&ap->tdev, host_handle, ap->port_no);
|
||||
|
||||
if (ata_acpi_gtm(ap, &ap->__acpi_init_gtm) == 0)
|
||||
ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
|
||||
|
@ -222,7 +222,7 @@ void ata_acpi_bind_dev(struct ata_device *dev)
|
|||
parent_handle = port_handle;
|
||||
}
|
||||
|
||||
ACPI_HANDLE_SET(&dev->tdev, acpi_get_child(parent_handle, adr));
|
||||
acpi_preset_companion(&dev->tdev, parent_handle, adr);
|
||||
|
||||
register_hotplug_dock_device(ata_dev_acpi_handle(dev),
|
||||
&ata_acpi_dev_dock_ops, dev, NULL, NULL);
|
||||
|
|
|
@ -432,7 +432,7 @@ struct platform_device *platform_device_register_full(
|
|||
goto err_alloc;
|
||||
|
||||
pdev->dev.parent = pdevinfo->parent;
|
||||
ACPI_HANDLE_SET(&pdev->dev, pdevinfo->acpi_node.handle);
|
||||
ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion);
|
||||
|
||||
if (pdevinfo->dma_mask) {
|
||||
/*
|
||||
|
@ -463,7 +463,7 @@ struct platform_device *platform_device_register_full(
|
|||
ret = platform_device_add(pdev);
|
||||
if (ret) {
|
||||
err:
|
||||
ACPI_HANDLE_SET(&pdev->dev, NULL);
|
||||
ACPI_COMPANION_SET(&pdev->dev, NULL);
|
||||
kfree(pdev->dev.dma_mask);
|
||||
|
||||
err_alloc:
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include <linux/acpi_gpio.h>
|
||||
#include <linux/idr.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/acpi.h>
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include <trace/events/gpio.h>
|
||||
|
|
|
@ -196,7 +196,7 @@ static bool intel_dsm_pci_probe(struct pci_dev *pdev)
|
|||
acpi_handle dhandle;
|
||||
int ret;
|
||||
|
||||
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
||||
dhandle = ACPI_HANDLE(&pdev->dev);
|
||||
if (!dhandle)
|
||||
return false;
|
||||
|
||||
|
|
|
@ -289,7 +289,7 @@ static void intel_didl_outputs(struct drm_device *dev)
|
|||
u32 temp;
|
||||
int i = 0;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
|
||||
handle = ACPI_HANDLE(&dev->pdev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev))
|
||||
return;
|
||||
|
||||
|
|
|
@ -116,7 +116,7 @@ mxm_shadow_dsm(struct nouveau_mxm *mxm, u8 version)
|
|||
acpi_handle handle;
|
||||
int ret;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&device->pdev->dev);
|
||||
handle = ACPI_HANDLE(&device->pdev->dev);
|
||||
if (!handle)
|
||||
return false;
|
||||
|
||||
|
|
|
@ -256,7 +256,7 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
|
|||
acpi_handle dhandle;
|
||||
int retval = 0;
|
||||
|
||||
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
||||
dhandle = ACPI_HANDLE(&pdev->dev);
|
||||
if (!dhandle)
|
||||
return false;
|
||||
|
||||
|
@ -404,7 +404,7 @@ bool nouveau_acpi_rom_supported(struct pci_dev *pdev)
|
|||
if (!nouveau_dsm_priv.dsm_detected && !nouveau_dsm_priv.optimus_detected)
|
||||
return false;
|
||||
|
||||
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
||||
dhandle = ACPI_HANDLE(&pdev->dev);
|
||||
if (!dhandle)
|
||||
return false;
|
||||
|
||||
|
@ -438,7 +438,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
|
||||
handle = ACPI_HANDLE(&dev->pdev->dev);
|
||||
if (!handle)
|
||||
return NULL;
|
||||
|
||||
|
|
|
@ -369,7 +369,7 @@ int radeon_atif_handler(struct radeon_device *rdev,
|
|||
return NOTIFY_DONE;
|
||||
|
||||
/* Check pending SBIOS requests */
|
||||
handle = DEVICE_ACPI_HANDLE(&rdev->pdev->dev);
|
||||
handle = ACPI_HANDLE(&rdev->pdev->dev);
|
||||
count = radeon_atif_get_sbios_requests(handle, &req);
|
||||
|
||||
if (count <= 0)
|
||||
|
@ -556,7 +556,7 @@ int radeon_acpi_pcie_notify_device_ready(struct radeon_device *rdev)
|
|||
struct radeon_atcs *atcs = &rdev->atcs;
|
||||
|
||||
/* Get the device handle */
|
||||
handle = DEVICE_ACPI_HANDLE(&rdev->pdev->dev);
|
||||
handle = ACPI_HANDLE(&rdev->pdev->dev);
|
||||
if (!handle)
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -596,7 +596,7 @@ int radeon_acpi_pcie_performance_request(struct radeon_device *rdev,
|
|||
u32 retry = 3;
|
||||
|
||||
/* Get the device handle */
|
||||
handle = DEVICE_ACPI_HANDLE(&rdev->pdev->dev);
|
||||
handle = ACPI_HANDLE(&rdev->pdev->dev);
|
||||
if (!handle)
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -699,7 +699,7 @@ int radeon_acpi_init(struct radeon_device *rdev)
|
|||
int ret;
|
||||
|
||||
/* Get the device handle */
|
||||
handle = DEVICE_ACPI_HANDLE(&rdev->pdev->dev);
|
||||
handle = ACPI_HANDLE(&rdev->pdev->dev);
|
||||
|
||||
/* No need to proceed if we're sure that ATIF is not supported */
|
||||
if (!ASIC_IS_AVIVO(rdev) || !rdev->bios || !handle)
|
||||
|
|
|
@ -8,8 +8,7 @@
|
|||
*/
|
||||
#include <linux/vga_switcheroo.h>
|
||||
#include <linux/slab.h>
|
||||
#include <acpi/acpi.h>
|
||||
#include <acpi/acpi_bus.h>
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/pci.h>
|
||||
|
||||
#include "radeon_acpi.h"
|
||||
|
@ -443,7 +442,7 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
|
|||
acpi_handle dhandle, atpx_handle;
|
||||
acpi_status status;
|
||||
|
||||
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
||||
dhandle = ACPI_HANDLE(&pdev->dev);
|
||||
if (!dhandle)
|
||||
return false;
|
||||
|
||||
|
@ -489,7 +488,7 @@ static int radeon_atpx_init(void)
|
|||
*/
|
||||
static int radeon_atpx_get_client_id(struct pci_dev *pdev)
|
||||
{
|
||||
if (radeon_atpx_priv.dhandle == DEVICE_ACPI_HANDLE(&pdev->dev))
|
||||
if (radeon_atpx_priv.dhandle == ACPI_HANDLE(&pdev->dev))
|
||||
return VGA_SWITCHEROO_IGD;
|
||||
else
|
||||
return VGA_SWITCHEROO_DIS;
|
||||
|
|
|
@ -185,7 +185,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev)
|
|||
return false;
|
||||
|
||||
while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
|
||||
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
||||
dhandle = ACPI_HANDLE(&pdev->dev);
|
||||
if (!dhandle)
|
||||
continue;
|
||||
|
||||
|
|
|
@ -1012,7 +1012,7 @@ static int i2c_hid_probe(struct i2c_client *client,
|
|||
hid->hid_get_raw_report = i2c_hid_get_raw_report;
|
||||
hid->hid_output_raw_report = i2c_hid_output_raw_report;
|
||||
hid->dev.parent = &client->dev;
|
||||
ACPI_HANDLE_SET(&hid->dev, ACPI_HANDLE(&client->dev));
|
||||
ACPI_COMPANION_SET(&hid->dev, ACPI_COMPANION(&client->dev));
|
||||
hid->bus = BUS_I2C;
|
||||
hid->version = le16_to_cpu(ihid->hdesc.bcdVersion);
|
||||
hid->vendor = le16_to_cpu(ihid->hdesc.wVendorID);
|
||||
|
|
|
@ -618,6 +618,22 @@ void i2c_unlock_adapter(struct i2c_adapter *adapter)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(i2c_unlock_adapter);
|
||||
|
||||
static void i2c_dev_set_name(struct i2c_adapter *adap,
|
||||
struct i2c_client *client)
|
||||
{
|
||||
struct acpi_device *adev = ACPI_COMPANION(&client->dev);
|
||||
|
||||
if (adev) {
|
||||
dev_set_name(&client->dev, "i2c-%s", acpi_dev_name(adev));
|
||||
return;
|
||||
}
|
||||
|
||||
/* For 10-bit clients, add an arbitrary offset to avoid collisions */
|
||||
dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
|
||||
client->addr | ((client->flags & I2C_CLIENT_TEN)
|
||||
? 0xa000 : 0));
|
||||
}
|
||||
|
||||
/**
|
||||
* i2c_new_device - instantiate an i2c device
|
||||
* @adap: the adapter managing the device
|
||||
|
@ -674,12 +690,9 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
|
|||
client->dev.bus = &i2c_bus_type;
|
||||
client->dev.type = &i2c_client_type;
|
||||
client->dev.of_node = info->of_node;
|
||||
ACPI_HANDLE_SET(&client->dev, info->acpi_node.handle);
|
||||
ACPI_COMPANION_SET(&client->dev, info->acpi_node.companion);
|
||||
|
||||
/* For 10-bit clients, add an arbitrary offset to avoid collisions */
|
||||
dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
|
||||
client->addr | ((client->flags & I2C_CLIENT_TEN)
|
||||
? 0xa000 : 0));
|
||||
i2c_dev_set_name(adap, client);
|
||||
status = device_register(&client->dev);
|
||||
if (status)
|
||||
goto out_err;
|
||||
|
@ -1103,7 +1116,7 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level,
|
|||
return AE_OK;
|
||||
|
||||
memset(&info, 0, sizeof(info));
|
||||
info.acpi_node.handle = handle;
|
||||
info.acpi_node.companion = adev;
|
||||
info.irq = -1;
|
||||
|
||||
INIT_LIST_HEAD(&resource_list);
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
* Copyright (C) 2006 Hannes Reinecke
|
||||
*/
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/ata.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/device.h>
|
||||
|
@ -19,8 +20,6 @@
|
|||
#include <linux/dmi.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <acpi/acpi_bus.h>
|
||||
|
||||
#define REGS_PER_GTF 7
|
||||
|
||||
struct GTM_buffer {
|
||||
|
@ -128,7 +127,7 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle,
|
|||
|
||||
DEBPRINT("ENTER: pci %02x:%02x.%01x\n", bus, devnum, func);
|
||||
|
||||
dev_handle = DEVICE_ACPI_HANDLE(dev);
|
||||
dev_handle = ACPI_HANDLE(dev);
|
||||
if (!dev_handle) {
|
||||
DEBPRINT("no acpi handle for device\n");
|
||||
goto err;
|
||||
|
|
|
@ -308,8 +308,7 @@ static void sdio_acpi_set_handle(struct sdio_func *func)
|
|||
struct mmc_host *host = func->card->host;
|
||||
u64 addr = (host->slotno << 16) | func->num;
|
||||
|
||||
ACPI_HANDLE_SET(&func->dev,
|
||||
acpi_get_child(ACPI_HANDLE(host->parent), addr));
|
||||
acpi_preset_companion(&func->dev, ACPI_HANDLE(host->parent), addr);
|
||||
}
|
||||
#else
|
||||
static inline void sdio_acpi_set_handle(struct sdio_func *func) {}
|
||||
|
|
|
@ -367,7 +367,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)
|
|||
string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL };
|
||||
}
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
||||
handle = ACPI_HANDLE(&pdev->dev);
|
||||
if (!handle) {
|
||||
/*
|
||||
* This hotplug controller was not listed in the ACPI name
|
||||
|
|
|
@ -54,7 +54,7 @@ int pciehp_acpi_slot_detection_check(struct pci_dev *dev)
|
|||
{
|
||||
if (slot_detection_mode != PCIEHP_DETECT_ACPI)
|
||||
return 0;
|
||||
if (acpi_pci_detect_ejectable(DEVICE_ACPI_HANDLE(&dev->dev)))
|
||||
if (acpi_pci_detect_ejectable(ACPI_HANDLE(&dev->dev)))
|
||||
return 0;
|
||||
return -ENODEV;
|
||||
}
|
||||
|
@ -96,7 +96,7 @@ static int __init dummy_probe(struct pcie_device *dev)
|
|||
dup_slot_id++;
|
||||
}
|
||||
list_add_tail(&slot->list, &dummy_slots);
|
||||
handle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
||||
handle = ACPI_HANDLE(&pdev->dev);
|
||||
if (!acpi_slot_detected && acpi_pci_detect_ejectable(handle))
|
||||
acpi_slot_detected = 1;
|
||||
return -ENODEV; /* dummy driver always returns error */
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
* Work to add BIOS PROM support was completed by Mike Habeck.
|
||||
*/
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
|
@ -29,7 +30,6 @@
|
|||
#include <asm/sn/sn_feature_sets.h>
|
||||
#include <asm/sn/sn_sal.h>
|
||||
#include <asm/sn/types.h>
|
||||
#include <linux/acpi.h>
|
||||
#include <asm/sn/acpi.h>
|
||||
|
||||
#include "../pci.h"
|
||||
|
@ -414,7 +414,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
|
|||
acpi_handle rethandle;
|
||||
acpi_status ret;
|
||||
|
||||
phandle = PCI_CONTROLLER(slot->pci_bus)->acpi_handle;
|
||||
phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion);
|
||||
|
||||
if (acpi_bus_get_device(phandle, &pdevice)) {
|
||||
dev_dbg(&slot->pci_bus->self->dev,
|
||||
|
@ -495,7 +495,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
|
|||
|
||||
/* free the ACPI resources for the slot */
|
||||
if (SN_ACPI_BASE_SUPPORT() &&
|
||||
PCI_CONTROLLER(slot->pci_bus)->acpi_handle) {
|
||||
PCI_CONTROLLER(slot->pci_bus)->companion) {
|
||||
unsigned long long adr;
|
||||
struct acpi_device *device;
|
||||
acpi_handle phandle;
|
||||
|
@ -504,7 +504,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
|
|||
acpi_status ret;
|
||||
|
||||
/* Get the rootbus node pointer */
|
||||
phandle = PCI_CONTROLLER(slot->pci_bus)->acpi_handle;
|
||||
phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion);
|
||||
|
||||
acpi_scan_lock_acquire();
|
||||
/*
|
||||
|
|
|
@ -37,7 +37,7 @@ static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent)
|
|||
char *type;
|
||||
struct resource *res;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle)
|
||||
return -EINVAL;
|
||||
|
||||
|
|
|
@ -173,14 +173,14 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
|
|||
|
||||
static bool acpi_pci_power_manageable(struct pci_dev *dev)
|
||||
{
|
||||
acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
acpi_handle handle = ACPI_HANDLE(&dev->dev);
|
||||
|
||||
return handle ? acpi_bus_power_manageable(handle) : false;
|
||||
}
|
||||
|
||||
static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
|
||||
{
|
||||
acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
acpi_handle handle = ACPI_HANDLE(&dev->dev);
|
||||
static const u8 state_conv[] = {
|
||||
[PCI_D0] = ACPI_STATE_D0,
|
||||
[PCI_D1] = ACPI_STATE_D1,
|
||||
|
@ -217,7 +217,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
|
|||
|
||||
static bool acpi_pci_can_wakeup(struct pci_dev *dev)
|
||||
{
|
||||
acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
acpi_handle handle = ACPI_HANDLE(&dev->dev);
|
||||
|
||||
return handle ? acpi_bus_can_wakeup(handle) : false;
|
||||
}
|
||||
|
|
|
@ -263,7 +263,7 @@ device_has_dsm(struct device *dev)
|
|||
acpi_handle handle;
|
||||
struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(dev);
|
||||
handle = ACPI_HANDLE(dev);
|
||||
|
||||
if (!handle)
|
||||
return FALSE;
|
||||
|
@ -295,7 +295,7 @@ acpilabel_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|||
acpi_handle handle;
|
||||
int length;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(dev);
|
||||
handle = ACPI_HANDLE(dev);
|
||||
|
||||
if (!handle)
|
||||
return -1;
|
||||
|
@ -316,7 +316,7 @@ acpiindex_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|||
acpi_handle handle;
|
||||
int length;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(dev);
|
||||
handle = ACPI_HANDLE(dev);
|
||||
|
||||
if (!handle)
|
||||
return -1;
|
||||
|
|
|
@ -519,7 +519,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
|
|||
|
||||
gmux_data->power_state = VGA_SWITCHEROO_ON;
|
||||
|
||||
gmux_data->dhandle = DEVICE_ACPI_HANDLE(&pnp->dev);
|
||||
gmux_data->dhandle = ACPI_HANDLE(&pnp->dev);
|
||||
if (!gmux_data->dhandle) {
|
||||
pr_err("Cannot find acpi handle for pnp device %s\n",
|
||||
dev_name(&pnp->dev));
|
||||
|
|
|
@ -89,7 +89,7 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
|
|||
|
||||
pnp_dbg(&dev->dev, "set resources\n");
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return -ENODEV;
|
||||
|
@ -122,7 +122,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
|
|||
|
||||
dev_dbg(&dev->dev, "disable resources\n");
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return 0;
|
||||
|
@ -144,7 +144,7 @@ static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
|
|||
struct acpi_device *acpi_dev;
|
||||
acpi_handle handle;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return false;
|
||||
|
@ -159,7 +159,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
|
|||
acpi_handle handle;
|
||||
int error = 0;
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
handle = ACPI_HANDLE(&dev->dev);
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
|
||||
return 0;
|
||||
|
@ -194,7 +194,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
|
|||
static int pnpacpi_resume(struct pnp_dev *dev)
|
||||
{
|
||||
struct acpi_device *acpi_dev;
|
||||
acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
|
||||
acpi_handle handle = ACPI_HANDLE(&dev->dev);
|
||||
int error = 0;
|
||||
|
||||
if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {
|
||||
|
|
|
@ -357,6 +357,19 @@ struct spi_device *spi_alloc_device(struct spi_master *master)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(spi_alloc_device);
|
||||
|
||||
static void spi_dev_set_name(struct spi_device *spi)
|
||||
{
|
||||
struct acpi_device *adev = ACPI_COMPANION(&spi->dev);
|
||||
|
||||
if (adev) {
|
||||
dev_set_name(&spi->dev, "spi-%s", acpi_dev_name(adev));
|
||||
return;
|
||||
}
|
||||
|
||||
dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
|
||||
spi->chip_select);
|
||||
}
|
||||
|
||||
/**
|
||||
* spi_add_device - Add spi_device allocated with spi_alloc_device
|
||||
* @spi: spi_device to register
|
||||
|
@ -383,9 +396,7 @@ int spi_add_device(struct spi_device *spi)
|
|||
}
|
||||
|
||||
/* Set the bus ID string */
|
||||
dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
|
||||
spi->chip_select);
|
||||
|
||||
spi_dev_set_name(spi);
|
||||
|
||||
/* We need to make sure there's no other device with this
|
||||
* chipselect **BEFORE** we call setup(), else we'll trash
|
||||
|
@ -1144,7 +1155,7 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,
|
|||
return AE_NO_MEMORY;
|
||||
}
|
||||
|
||||
ACPI_HANDLE_SET(&spi->dev, handle);
|
||||
ACPI_COMPANION_SET(&spi->dev, adev);
|
||||
spi->irq = -1;
|
||||
|
||||
INIT_LIST_HEAD(&resource_list);
|
||||
|
|
|
@ -5501,6 +5501,6 @@ acpi_handle usb_get_hub_port_acpi_handle(struct usb_device *hdev,
|
|||
if (!hub)
|
||||
return NULL;
|
||||
|
||||
return DEVICE_ACPI_HANDLE(&hub->ports[port1 - 1]->dev);
|
||||
return ACPI_HANDLE(&hub->ports[port1 - 1]->dev);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -173,7 +173,7 @@ static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
|
|||
}
|
||||
|
||||
/* root hub's parent is the usb hcd. */
|
||||
parent_handle = DEVICE_ACPI_HANDLE(dev->parent);
|
||||
parent_handle = ACPI_HANDLE(dev->parent);
|
||||
*handle = acpi_get_child(parent_handle, udev->portnum);
|
||||
if (!*handle)
|
||||
return -ENODEV;
|
||||
|
@ -194,7 +194,7 @@ static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
|
|||
|
||||
raw_port_num = usb_hcd_find_raw_port_number(hcd,
|
||||
port_num);
|
||||
*handle = acpi_get_child(DEVICE_ACPI_HANDLE(&udev->dev),
|
||||
*handle = acpi_get_child(ACPI_HANDLE(&udev->dev),
|
||||
raw_port_num);
|
||||
if (!*handle)
|
||||
return -ENODEV;
|
||||
|
|
|
@ -58,12 +58,12 @@ static int xen_add_device(struct device *dev)
|
|||
add.flags = XEN_PCI_DEV_EXTFN;
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
handle = DEVICE_ACPI_HANDLE(&pci_dev->dev);
|
||||
handle = ACPI_HANDLE(&pci_dev->dev);
|
||||
if (!handle && pci_dev->bus->bridge)
|
||||
handle = DEVICE_ACPI_HANDLE(pci_dev->bus->bridge);
|
||||
handle = ACPI_HANDLE(pci_dev->bus->bridge);
|
||||
#ifdef CONFIG_PCI_IOV
|
||||
if (!handle && pci_dev->is_virtfn)
|
||||
handle = DEVICE_ACPI_HANDLE(physfn->bus->bridge);
|
||||
handle = ACPI_HANDLE(physfn->bus->bridge);
|
||||
#endif
|
||||
if (handle) {
|
||||
acpi_status status;
|
||||
|
|
|
@ -431,9 +431,9 @@ static inline acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
|
|||
{
|
||||
return acpi_find_child(handle, addr, false);
|
||||
}
|
||||
void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr);
|
||||
int acpi_is_root_bridge(acpi_handle);
|
||||
struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);
|
||||
#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)ACPI_HANDLE(dev))
|
||||
|
||||
int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state);
|
||||
int acpi_disable_wakeup_device_power(struct acpi_device *dev);
|
||||
|
|
|
@ -44,6 +44,20 @@
|
|||
#include <acpi/acpi_numa.h>
|
||||
#include <asm/acpi.h>
|
||||
|
||||
static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
|
||||
{
|
||||
return adev ? adev->handle : NULL;
|
||||
}
|
||||
|
||||
#define ACPI_COMPANION(dev) ((dev)->acpi_node.companion)
|
||||
#define ACPI_COMPANION_SET(dev, adev) ACPI_COMPANION(dev) = (adev)
|
||||
#define ACPI_HANDLE(dev) acpi_device_handle(ACPI_COMPANION(dev))
|
||||
|
||||
static inline const char *acpi_dev_name(struct acpi_device *adev)
|
||||
{
|
||||
return dev_name(&adev->dev);
|
||||
}
|
||||
|
||||
enum acpi_irq_model_id {
|
||||
ACPI_IRQ_MODEL_PIC = 0,
|
||||
ACPI_IRQ_MODEL_IOAPIC,
|
||||
|
@ -401,6 +415,15 @@ static inline bool acpi_driver_match_device(struct device *dev,
|
|||
|
||||
#define acpi_disabled 1
|
||||
|
||||
#define ACPI_COMPANION(dev) (NULL)
|
||||
#define ACPI_COMPANION_SET(dev, adev) do { } while (0)
|
||||
#define ACPI_HANDLE(dev) (NULL)
|
||||
|
||||
static inline const char *acpi_dev_name(struct acpi_device *adev)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline void acpi_early_init(void) { }
|
||||
|
||||
static inline int early_acpi_boot_init(void)
|
||||
|
|
|
@ -644,9 +644,11 @@ struct device_dma_parameters {
|
|||
unsigned long segment_boundary_mask;
|
||||
};
|
||||
|
||||
struct acpi_device;
|
||||
|
||||
struct acpi_dev_node {
|
||||
#ifdef CONFIG_ACPI
|
||||
void *handle;
|
||||
struct acpi_device *companion;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -790,14 +792,6 @@ static inline struct device *kobj_to_dev(struct kobject *kobj)
|
|||
return container_of(kobj, struct device, kobj);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
#define ACPI_HANDLE(dev) ((dev)->acpi_node.handle)
|
||||
#define ACPI_HANDLE_SET(dev, _handle_) (dev)->acpi_node.handle = (_handle_)
|
||||
#else
|
||||
#define ACPI_HANDLE(dev) (NULL)
|
||||
#define ACPI_HANDLE_SET(dev, _handle_) do { } while (0)
|
||||
#endif
|
||||
|
||||
/* Get the wakeup routines, which depend on struct device */
|
||||
#include <linux/pm_wakeup.h>
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
|
|||
while (!pci_is_root_bus(pbus))
|
||||
pbus = pbus->parent;
|
||||
|
||||
return DEVICE_ACPI_HANDLE(pbus->bridge);
|
||||
return ACPI_HANDLE(pbus->bridge);
|
||||
}
|
||||
|
||||
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
|
||||
|
@ -39,7 +39,7 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
|
|||
else
|
||||
dev = &pbus->self->dev;
|
||||
|
||||
return DEVICE_ACPI_HANDLE(dev);
|
||||
return ACPI_HANDLE(dev);
|
||||
}
|
||||
|
||||
void acpi_pci_add_bus(struct pci_bus *bus);
|
||||
|
|
Loading…
Reference in a new issue