diff options
| author | Alex Chiang <achiang@hp.com> | 2009-10-19 15:14:40 -0600 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 03:03:11 -0500 |
| commit | 9751cb721ef650729e981c7b39abb7676cd646e1 (patch) | |
| tree | b497f5a6fe41802280c4991feab7ce17e873f4c4 /drivers | |
| parent | c6f1905ea91bf56a921c6eb574488869c8c3eeff (diff) | |
| download | blackbird-op-linux-9751cb721ef650729e981c7b39abb7676cd646e1.tar.gz blackbird-op-linux-9751cb721ef650729e981c7b39abb7676cd646e1.zip | |
ACPI: dock: dock_add - hoist up platform_device_register_simple()
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>
Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/dock.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 0a1221854a25..3bd89823402a 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -948,11 +948,18 @@ 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); + if (IS_ERR(dock_device)) + return PTR_ERR(dock_device); + /* 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); @@ -961,15 +968,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; - if (IS_ERR(dock_device)) { - ret = PTR_ERR(dock_device); - goto out; - } platform_device_add_data(dock_device, &dock_station, sizeof(struct dock_station *)); |
