From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 5 Jul 2013 01:23:36 +0000 (+0200)
Subject: ACPI / dock: Drop unnecessary local variable from dock_add()
X-Git-Tag: firefly_0821_release~176^2~5466^2~17^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2efbca4dfc7b43951de6dd1647f9eebda9d4372b;p=firefly-linux-kernel-4.4.55.git

ACPI / dock: Drop unnecessary local variable from dock_add()

The local variable id in dock_add() is not necessary, so drop it.

While we're at it, use an initializer to clear the local variable ds
and drop the memset() used for this purpose.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index c89a9c3b48b4..f601658a4ad2 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -836,14 +836,13 @@ static struct attribute_group dock_attribute_group = {
  */
 static int __init dock_add(acpi_handle handle)
 {
-	int ret, id;
-	struct dock_station ds, *dock_station;
+	struct dock_station *dock_station, ds = { NULL, };
 	struct platform_device *dd;
 	acpi_status status;
+	int ret;
 
-	id = dock_station_count;
-	memset(&ds, 0, sizeof(ds));
-	dd = platform_device_register_data(NULL, "dock", id, &ds, sizeof(ds));
+	dd = platform_device_register_data(NULL, "dock", dock_station_count,
+					   &ds, sizeof(ds));
 	if (IS_ERR(dd))
 		return PTR_ERR(dd);