diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-03-09 20:08:25 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-20 14:06:12 +0100 |
| commit | dec8c37818a26869ba5cdf0b1033eeb9296dc2fb (patch) | |
| tree | 2247d75e0da092eaf1bc72cef6f437295a627b22 /drivers/staging/panel | |
| parent | e134201b7a27eaf1ce3affe39ea6f30a1a747186 (diff) | |
| download | op-kernel-dev-dec8c37818a26869ba5cdf0b1033eeb9296dc2fb.zip op-kernel-dev-dec8c37818a26869ba5cdf0b1033eeb9296dc2fb.tar.gz | |
staging: panel: remove initialization check
no need to monitor init_in_progress now as keypad_send_key() can only
be called after the timer is initialized. and timer is initialized
from keypad_init() which is in the attach section and can only execute
after the module has initialized.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Acked-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/panel')
| -rw-r--r-- | drivers/staging/panel/panel.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index ee26413..b7ffdfb 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -473,8 +473,6 @@ static struct pardevice *pprt; static int keypad_initialized; -static char init_in_progress; - static void (*lcd_write_cmd)(int); static void (*lcd_write_data)(int); static void (*lcd_clear_fast)(void); @@ -1718,9 +1716,6 @@ static struct miscdevice keypad_dev = { static void keypad_send_key(const char *string, int max_len) { - if (init_in_progress) - return; - /* send the key to the device only if a process is attached to it. */ if (!atomic_read(&keypad_available)) { while (max_len-- && keypad_buflen < KEYPAD_BUFFER && *string) { @@ -2379,9 +2374,6 @@ static int __init panel_init_module(void) break; } - /* tells various subsystems about the fact that we are initializing */ - init_in_progress = 1; - if (!lcd.enabled && !keypad.enabled) { /* no device enabled, let's exit */ pr_err("driver version " PANEL_VERSION " disabled.\n"); @@ -2401,9 +2393,6 @@ static int __init panel_init_module(void) else pr_info("driver version " PANEL_VERSION " not yet registered\n"); - /* tells various subsystems about the fact that initialization - is finished */ - init_in_progress = 0; return 0; } |
