Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f6f2804 authored by Kristen Carlson Accardi's avatar Kristen Carlson Accardi Committed by Len Brown
Browse files

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: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 22fe4c21

drivers/acpi/dock.c

+23 −24
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_DESCRIPTION); 
MODULE_LICENSE("GPL");



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";



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)

{

	struct device *dev = &dock_device.dev;

	struct device *dev = &dock_device->dev;

	/*

	 * Indicate that the status of the dock station has

	 * changed.
@@ -710,37 +710,36 @@ static int dock_add(acpi_handle handle) 
	ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);



	/* initialize platform device stuff */

	dock_device.name = dock_device_name;

	ret = platform_device_register(&dock_device);

	if (ret) {

		printk(KERN_ERR PREFIX "Error %d registering dock device\n", ret);

	dock_device =

		platform_device_register_simple(dock_device_name, 0, NULL, 0);

	if (IS_ERR(dock_device)) {

		kfree(dock_station);

		dock_station = NULL;

		return ret;

		return PTR_ERR(dock_device);

	}

	ret = device_create_file(&dock_device.dev, &dev_attr_docked);

	ret = device_create_file(&dock_device->dev, &dev_attr_docked);

	if (ret) {

		printk("Error %d adding sysfs file\n", ret);

		platform_device_unregister(&dock_device);

		platform_device_unregister(dock_device);

		kfree(dock_station);

		dock_station = NULL;

		return ret;

	}

	ret = device_create_file(&dock_device.dev, &dev_attr_undock);

	ret = device_create_file(&dock_device->dev, &dev_attr_undock);

	if (ret) {

		printk("Error %d adding sysfs file\n", ret);

		device_remove_file(&dock_device.dev, &dev_attr_docked);

		platform_device_unregister(&dock_device);

		device_remove_file(&dock_device->dev, &dev_attr_docked);

		platform_device_unregister(dock_device);

		kfree(dock_station);

		dock_station = NULL;

		return ret;

	}

	ret = device_create_file(&dock_device.dev, &dev_attr_uid);

	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);

		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);

		dock_station = NULL;

		return ret;
@@ -779,10 +778,10 @@ static int dock_add(acpi_handle handle) 
dock_add_err:

	kfree(dd);

dock_add_err_unregister:

	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_uid);

	platform_device_unregister(&dock_device);

	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_uid);

	platform_device_unregister(dock_device);

	kfree(dock_station);

	dock_station = NULL;

	return ret;
@@ -812,10 +811,10 @@ static int dock_remove(void) 
		printk(KERN_ERR "Error removing notify handler\n");



	/* cleanup sysfs */

	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_uid);

	platform_device_unregister(&dock_device);

	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_uid);

	platform_device_unregister(dock_device);



	/* free dock station memory */

	kfree(dock_station);