lkml.org 
[lkml]   [2009]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH v2 4/6] ACPI: dock: dock_add - hoist up platform_device_register_simple()
FromAlex Chiang <>
DateWed, 14 Oct 2009 16:46:31 -0600
Move the call to platform_device_register_simple so that we do it
before allocating and initializing our struct dock_station.

Signed-off-by: Alex Chiang <achiang@hp.com>
---
drivers/acpi/dock.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index e57be55..363be0a 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -935,11 +935,19 @@ static int dock_add(acpi_handle handle)
struct dock_station *dock_station;
struct platform_device *dock_device;

+ dock_device =
+ platform_device_register_simple("dock",
+ dock_station_count, NULL, 0);
+ ret = IS_ERR(dock_device) ? PTR_ERR(dock_device) : 0;
+ if (ret)
+ return ret;
+
/* allocate & initialize the dock_station private data */
dock_station = kzalloc(sizeof(*dock_station), GFP_KERNEL);
if (!dock_station)
return -ENOMEM;
dock_station->handle = handle;
+ dock_station->dock_device = dock_device;
dock_station->last_dock_time = jiffies - HZ;
INIT_LIST_HEAD(&dock_station->dependent_devices);
INIT_LIST_HEAD(&dock_station->hotplug_devices);
@@ -948,14 +956,6 @@ static int dock_add(acpi_handle handle)
mutex_init(&dock_station->hp_lock);
ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);

- /* initialize platform device stuff */
- dock_station->dock_device =
- platform_device_register_simple("dock",
- dock_station_count, NULL, 0);
- dock_device = dock_station->dock_device;
- ret = IS_ERR(dock_device) ? PTR_ERR(dock_device) : 0;
- if (ret)
- goto out;
platform_device_add_data(dock_device, &dock_station,
sizeof(struct dock_station *));



\
 
 \ /
  Last update: 2009-10-15 00:57    [from the cache]
©2003-2010