diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-25 21:51:48 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-25 21:51:48 (GMT) |
| commit | ab736d7dc17e681be001648607be20c549b6229c (patch) | |
| tree | 1bdb29dd23105897329c3b796f2e88877ef6d8b8 /drivers/gpio/gpiolib.c | |
| parent | 32b88194f71d6ae7768a29f87fbba454728273ee (diff) | |
| parent | 205ad97fc5a6386214323641dd28b822cb6fc624 (diff) | |
| download | linux-ab736d7dc17e681be001648607be20c549b6229c.tar.xz | |
Merge branch 'device-properties'
* device-properties:
ACPI / property: Fix subnode lookup scope for data-only subnodes
acpi-dma: Add support for "dma-names" device property
device property: Add fwnode_property_match_string()
ACPI / property: Extend device_get_next_child_node() to data-only nodes
ACPI / gpio: Split acpi_get_gpiod_by_index()
ACPI / property: Extend fwnode_property_* to data-only subnodes
ACPI / property: Expose data-only subnodes via sysfs
ACPI / property: Add support for data-only subnodes
ACPI / property: Add routine for extraction of _DSD properties
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 5db3445..c52a70f 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2093,8 +2093,7 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, } else if (is_acpi_node(fwnode)) { struct acpi_gpio_info info; - desc = acpi_get_gpiod_by_index(to_acpi_node(fwnode), propname, 0, - &info); + desc = acpi_node_get_gpiod(fwnode, propname, 0, &info); if (!IS_ERR(desc)) active_low = info.active_low; } |