lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: dock: dock_add - hoist up platform_device_register_simple()

Browse Source 
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>
This commit is contained in:
Alex Chiang
2009-10-19 15:14:40 -06:00
committed by Len Brown
parent c6f1905ea9
commit 9751cb721e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/acpi/dock.c
View File

@@ -948,11 +948,18 @@ static int dock_add(acpi_handle handle)
struct dock_station *dock_station; struct dock_station *dock_station;
struct platform_device *dock_device; 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 */ /* allocate & initialize the dock_station private data */
dock_station = kzalloc(sizeof(*dock_station), GFP_KERNEL); dock_station = kzalloc(sizeof(*dock_station), GFP_KERNEL);
if (!dock_station) if (!dock_station)
return -ENOMEM; return -ENOMEM;
dock_station->handle = handle; dock_station->handle = handle;
dock_station->dock_device = dock_device;
dock_station->last_dock_time = jiffies - HZ; dock_station->last_dock_time = jiffies - HZ;
INIT_LIST_HEAD(&dock_station->dependent_devices); INIT_LIST_HEAD(&dock_station->dependent_devices);
INIT_LIST_HEAD(&dock_station->hotplug_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); mutex_init(&dock_station->hp_lock);
ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list); 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, platform_device_add_data(dock_device, &dock_station,
sizeof(struct dock_station *)); sizeof(struct dock_station *));