forked from luck/tmp_suning_uos_patched
ACPI: dock: use dynamically allocated platform device
Get rid of no release function warnings by switching to dynamically allocating the platform_device and using the platform device release routine in the base driver. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
22fe4c2114
commit
0f6f280456
@ -41,7 +41,7 @@ MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_DESCRIPTION);
|
|||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
static struct atomic_notifier_head dock_notifier_list;
|
static struct atomic_notifier_head dock_notifier_list;
|
||||||
static struct platform_device dock_device;
|
static struct platform_device *dock_device;
|
||||||
static char dock_device_name[] = "dock";
|
static char dock_device_name[] = "dock";
|
||||||
|
|
||||||
struct dock_station {
|
struct dock_station {
|
||||||
@ -327,7 +327,7 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
|
|||||||
|
|
||||||
static void dock_event(struct dock_station *ds, u32 event, int num)
|
static void dock_event(struct dock_station *ds, u32 event, int num)
|
||||||
{
|
{
|
||||||
struct device *dev = &dock_device.dev;
|
struct device *dev = &dock_device->dev;
|
||||||
/*
|
/*
|
||||||
* Indicate that the status of the dock station has
|
* Indicate that the status of the dock station has
|
||||||
* changed.
|
* changed.
|
||||||
@ -710,37 +710,36 @@ static int dock_add(acpi_handle handle)
|
|||||||
ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
|
ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
|
||||||
|
|
||||||
/* initialize platform device stuff */
|
/* initialize platform device stuff */
|
||||||
dock_device.name = dock_device_name;
|
dock_device =
|
||||||
ret = platform_device_register(&dock_device);
|
platform_device_register_simple(dock_device_name, 0, NULL, 0);
|
||||||
|
if (IS_ERR(dock_device)) {
|
||||||
|
kfree(dock_station);
|
||||||
|
dock_station = NULL;
|
||||||
|
return PTR_ERR(dock_device);
|
||||||
|
}
|
||||||
|
ret = device_create_file(&dock_device->dev, &dev_attr_docked);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printk(KERN_ERR PREFIX "Error %d registering dock device\n", ret);
|
printk("Error %d adding sysfs file\n", ret);
|
||||||
|
platform_device_unregister(dock_device);
|
||||||
kfree(dock_station);
|
kfree(dock_station);
|
||||||
dock_station = NULL;
|
dock_station = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
ret = device_create_file(&dock_device.dev, &dev_attr_docked);
|
ret = device_create_file(&dock_device->dev, &dev_attr_undock);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printk("Error %d adding sysfs file\n", ret);
|
printk("Error %d adding sysfs file\n", ret);
|
||||||
platform_device_unregister(&dock_device);
|
device_remove_file(&dock_device->dev, &dev_attr_docked);
|
||||||
|
platform_device_unregister(dock_device);
|
||||||
kfree(dock_station);
|
kfree(dock_station);
|
||||||
dock_station = NULL;
|
dock_station = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
ret = device_create_file(&dock_device.dev, &dev_attr_undock);
|
ret = device_create_file(&dock_device->dev, &dev_attr_uid);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printk("Error %d adding sysfs file\n", ret);
|
printk("Error %d adding sysfs file\n", ret);
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_docked);
|
device_remove_file(&dock_device->dev, &dev_attr_docked);
|
||||||
platform_device_unregister(&dock_device);
|
device_remove_file(&dock_device->dev, &dev_attr_undock);
|
||||||
kfree(dock_station);
|
platform_device_unregister(dock_device);
|
||||||
dock_station = NULL;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
ret = device_create_file(&dock_device.dev, &dev_attr_uid);
|
|
||||||
if (ret) {
|
|
||||||
printk("Error %d adding sysfs file\n", ret);
|
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_docked);
|
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_undock);
|
|
||||||
platform_device_unregister(&dock_device);
|
|
||||||
kfree(dock_station);
|
kfree(dock_station);
|
||||||
dock_station = NULL;
|
dock_station = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
@ -779,10 +778,10 @@ static int dock_add(acpi_handle handle)
|
|||||||
dock_add_err:
|
dock_add_err:
|
||||||
kfree(dd);
|
kfree(dd);
|
||||||
dock_add_err_unregister:
|
dock_add_err_unregister:
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_docked);
|
device_remove_file(&dock_device->dev, &dev_attr_docked);
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_undock);
|
device_remove_file(&dock_device->dev, &dev_attr_undock);
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_uid);
|
device_remove_file(&dock_device->dev, &dev_attr_uid);
|
||||||
platform_device_unregister(&dock_device);
|
platform_device_unregister(dock_device);
|
||||||
kfree(dock_station);
|
kfree(dock_station);
|
||||||
dock_station = NULL;
|
dock_station = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
@ -812,10 +811,10 @@ static int dock_remove(void)
|
|||||||
printk(KERN_ERR "Error removing notify handler\n");
|
printk(KERN_ERR "Error removing notify handler\n");
|
||||||
|
|
||||||
/* cleanup sysfs */
|
/* cleanup sysfs */
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_docked);
|
device_remove_file(&dock_device->dev, &dev_attr_docked);
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_undock);
|
device_remove_file(&dock_device->dev, &dev_attr_undock);
|
||||||
device_remove_file(&dock_device.dev, &dev_attr_uid);
|
device_remove_file(&dock_device->dev, &dev_attr_uid);
|
||||||
platform_device_unregister(&dock_device);
|
platform_device_unregister(dock_device);
|
||||||
|
|
||||||
/* free dock station memory */
|
/* free dock station memory */
|
||||||
kfree(dock_station);
|
kfree(dock_station);
|
||||||
|
Loading…
Reference in New Issue
Block a user