[PATCH] ACPI / dock: Make 'docked' sysfs attribute work as documented
From: Rafael J. Wysocki After recent ACPI core changes acpi_bus_get_device() will always succeed for dock station ACPI device objects, so show_docked() should not use that function's return value as an indicator of whether or not the dock device is present. Make it use acpi_device_enumerated() for this purpose. Fixes: 202317a573b2 (ACPI / scan: Add acpi_device objects for all device nodes in the namespace) Signed-off-by: Rafael J. Wysocki --- 3.14 material overlooked previously. And I actually was able to test this one some. :-) Thanks, Rafael --- drivers/acpi/dock.c |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) Index: linux-pm/drivers/acpi/dock.c === --- linux-pm.orig/drivers/acpi/dock.c +++ linux-pm/drivers/acpi/dock.c @@ -713,13 +713,11 @@ static acpi_status __init find_dock_devi static ssize_t show_docked(struct device *dev, struct device_attribute *attr, char *buf) { - struct acpi_device *tmp; - struct dock_station *dock_station = dev->platform_data; + struct acpi_device *adev = NULL; - if (!acpi_bus_get_device(dock_station->handle, )) - return snprintf(buf, PAGE_SIZE, "1\n"); - return snprintf(buf, PAGE_SIZE, "0\n"); + acpi_bus_get_device(dock_station->handle, ); + return snprintf(buf, PAGE_SIZE, "%u\n", acpi_device_enumerated(adev)); } static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ACPI / dock: Make 'docked' sysfs attribute work as documented
From: Rafael J. Wysocki rafael.j.wyso...@intel.com After recent ACPI core changes acpi_bus_get_device() will always succeed for dock station ACPI device objects, so show_docked() should not use that function's return value as an indicator of whether or not the dock device is present. Make it use acpi_device_enumerated() for this purpose. Fixes: 202317a573b2 (ACPI / scan: Add acpi_device objects for all device nodes in the namespace) Signed-off-by: Rafael J. Wysocki rafael.j.wyso...@intel.com --- 3.14 material overlooked previously. And I actually was able to test this one some. :-) Thanks, Rafael --- drivers/acpi/dock.c |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) Index: linux-pm/drivers/acpi/dock.c === --- linux-pm.orig/drivers/acpi/dock.c +++ linux-pm/drivers/acpi/dock.c @@ -713,13 +713,11 @@ static acpi_status __init find_dock_devi static ssize_t show_docked(struct device *dev, struct device_attribute *attr, char *buf) { - struct acpi_device *tmp; - struct dock_station *dock_station = dev-platform_data; + struct acpi_device *adev = NULL; - if (!acpi_bus_get_device(dock_station-handle, tmp)) - return snprintf(buf, PAGE_SIZE, 1\n); - return snprintf(buf, PAGE_SIZE, 0\n); + acpi_bus_get_device(dock_station-handle, adev); + return snprintf(buf, PAGE_SIZE, %u\n, acpi_device_enumerated(adev)); } static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL); -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/