From: Jiang Liu Date: Fri, 28 Jun 2013 16:24:37 +0000 (+0800) Subject: ACPI / dock: simplify dock_create_acpi_device() X-Git-Tag: next-20130717~49^2~2^2~16 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=472d963befe28b8614ea2789757b27536c8d79eb;p=karo-tx-linux.git ACPI / dock: simplify dock_create_acpi_device() The return value of dock_create_acpi_device() is not used at all, so change its signature to return void and simplify the implementation of it. Signed-off-by: Jiang Liu Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index f3ec722ae85a..1bdb1facc17b 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -351,10 +351,8 @@ static int dock_present(struct dock_station *ds) * handle if one does not exist already. This should cause * acpi to scan for drivers for the given devices, and call * matching driver's add routine. - * - * Returns a pointer to the acpi_device corresponding to the handle. */ -static struct acpi_device * dock_create_acpi_device(acpi_handle handle) +static void dock_create_acpi_device(acpi_handle handle) { struct acpi_device *device; int ret; @@ -367,10 +365,7 @@ static struct acpi_device * dock_create_acpi_device(acpi_handle handle) ret = acpi_bus_scan(handle); if (ret) pr_debug("error adding bus, %x\n", -ret); - - acpi_bus_get_device(handle, &device); } - return device; } /**