diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-25 20:59:51 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-25 20:59:51 +0100 |
| commit | fe0a20a3eff282efae9f891fd10081a9e2b45c96 (patch) | |
| tree | 48b5d81c132f9ada373464bdc0a04e1d23cfa532 /drivers/acpi/glue.c | |
| parent | f42712a92e660fbee2193c5dde672470d099f63f (diff) | |
| parent | ca5b74d2675a44f54aacb919c1cf022463e2f738 (diff) | |
Merge branch 'acpi-driver-core' into device-properties
Diffstat (limited to 'drivers/acpi/glue.c')
| -rw-r--r-- | drivers/acpi/glue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index f774c65ecb8b..39c485b0c25c 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -168,7 +168,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) unsigned int node_id; int retval = -EINVAL; - if (ACPI_COMPANION(dev)) { + if (has_acpi_companion(dev)) { if (acpi_dev) { dev_warn(dev, "ACPI companion already set\n"); return -EINVAL; @@ -220,7 +220,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) list_add(&physical_node->node, physnode_list); acpi_dev->physical_node_count++; - if (!ACPI_COMPANION(dev)) + if (!has_acpi_companion(dev)) ACPI_COMPANION_SET(dev, acpi_dev); acpi_physnode_link_name(physical_node_name, node_id); |