evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACPI / dock: Simplify dock_init_hotplug() and dock_release_hotplug()

Browse source 
Make dock_init_hotplug() and dock_release_hotplug() slightly simpler
and move some checks in those functions to the code paths where they
are needed.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
This commit is contained in:
Rafael J. Wysocki 2013-06-30 23:47:14 +02:00
parent 37f908778f
commit 4ec24065a6
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/acpi/dock.c
View file

@ -130,19 +130,16 @@ static int dock_init_hotplug(struct dock_dependent_device *dd,
int ret = 0; int ret = 0;
mutex_lock(&hotplug_lock); mutex_lock(&hotplug_lock);
if (WARN_ON(dd->hp_context)) {
if (dd->hp_context) {
ret = -EEXIST; ret = -EEXIST;
} else { } else {
dd->hp_refcount = 1; dd->hp_refcount = 1;
dd->hp_ops = ops; dd->hp_ops = ops;
dd->hp_context = context; dd->hp_context = context;
dd->hp_release = release; dd->hp_release = release;
if (init)
init(context);
} }
if (!WARN_ON(ret) && init)
init(context);
mutex_unlock(&hotplug_lock); mutex_unlock(&hotplug_lock);
return ret; return ret;
} }
@ -157,22 +154,17 @@ static int dock_init_hotplug(struct dock_dependent_device *dd,
*/ */
static void dock_release_hotplug(struct dock_dependent_device *dd) static void dock_release_hotplug(struct dock_dependent_device *dd)
{ {
void (*release)(void *) = NULL;
void *context = NULL;
mutex_lock(&hotplug_lock); mutex_lock(&hotplug_lock);
if (dd->hp_context && !--dd->hp_refcount) { if (dd->hp_context && !--dd->hp_refcount) {
void (*release)(void *) = dd->hp_release;
void *context = dd->hp_context;
dd->hp_ops = NULL; dd->hp_ops = NULL;
context = dd->hp_context;
dd->hp_context = NULL; dd->hp_context = NULL;
release = dd->hp_release;
dd->hp_release = NULL; dd->hp_release = NULL;
if (release)
release(context);
} }
if (release && context)
release(context);
mutex_unlock(&hotplug_lock); mutex_unlock(&hotplug_lock);
} }