projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thinkpad-acpi: kill hotkey_thread_mutex
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
platform
/
x86
/
thinkpad_acpi.c
diff --git
a/drivers/platform/x86/thinkpad_acpi.c
b/drivers/platform/x86/thinkpad_acpi.c
index
9a90756
..
edec135
100644
(file)
--- a/
drivers/platform/x86/thinkpad_acpi.c
+++ b/
drivers/platform/x86/thinkpad_acpi.c
@@
-1964,9
+1964,6
@@
struct tp_nvram_state {
/* kthread for the hotkey poller */
static struct task_struct *tpacpi_hotkey_task;
/* kthread for the hotkey poller */
static struct task_struct *tpacpi_hotkey_task;
-/* Acquired while the poller kthread is running, use to sync start/stop */
-static struct mutex hotkey_thread_mutex;
-
/*
* Acquire mutex to write poller control variables as an
* atomic block.
/*
* Acquire mutex to write poller control variables as an
* atomic block.
@@
-2462,8
+2459,6
@@
static int hotkey_kthread(void *data)
unsigned int poll_freq;
bool was_frozen;
unsigned int poll_freq;
bool was_frozen;
- mutex_lock(&hotkey_thread_mutex);
-
if (tpacpi_lifecycle == TPACPI_LIFE_EXITING)
goto exit;
if (tpacpi_lifecycle == TPACPI_LIFE_EXITING)
goto exit;
@@
-2523,7
+2518,6
@@
static int hotkey_kthread(void *data)
}
exit:
}
exit:
- mutex_unlock(&hotkey_thread_mutex);
return 0;
}
return 0;
}
@@
-2533,9
+2527,6
@@
static void hotkey_poll_stop_sync(void)
if (tpacpi_hotkey_task) {
kthread_stop(tpacpi_hotkey_task);
tpacpi_hotkey_task = NULL;
if (tpacpi_hotkey_task) {
kthread_stop(tpacpi_hotkey_task);
tpacpi_hotkey_task = NULL;
- mutex_lock(&hotkey_thread_mutex);
- /* at this point, the thread did exit */
- mutex_unlock(&hotkey_thread_mutex);
}
}
}
}
@@
-3234,7
+3225,6
@@
static int __init hotkey_init(struct ibm_init_struct *iibm)
mutex_init(&hotkey_mutex);
#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
mutex_init(&hotkey_mutex);
#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
- mutex_init(&hotkey_thread_mutex);
mutex_init(&hotkey_thread_data_mutex);
#endif
mutex_init(&hotkey_thread_data_mutex);
#endif