android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: panel: (coding style) Line alignments and malloc sizeof

Browse Source 
Style-only modifications to comply with checkpatch.pl --strict --file.
. Correctly realigns the lines that needed to be ;
. Suppress useless blank rows ;
. Fix sizeof() issues in various -malloc() functions.

Signed-off-by: Dominique van den Broeck <domdevlin@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dominique van den Broeck
2014-05-21 14:10:00 +02:00
committed by Greg Kroah-Hartman
parent 3ac7690429
commit fdf4a4948c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/panel/panel.c
View File

@ -462,7 +462,7 @@ MODULE_PARM_DESC(lcd_type,
static int lcd_proto = -1; static int lcd_proto = -1;
module_param(lcd_proto, int, 0000); module_param(lcd_proto, int, 0000);
MODULE_PARM_DESC(lcd_proto, MODULE_PARM_DESC(lcd_proto,
"LCD communication: 0=parallel (//), 1=serial, 2=TI LCD Interface"); "LCD communication: 0=parallel (//), 1=serial, 2=TI LCD Interface");
static int lcd_charset = -1; static int lcd_charset = -1;
module_param(lcd_charset, int, 0000); module_param(lcd_charset, int, 0000);
@ -951,7 +951,6 @@ static void lcd_clear_display(void)
static void lcd_init_display(void) static void lcd_init_display(void)
{ {
lcd_flags = ((lcd_height > 1) ? LCD_FLAG_N : 0) lcd_flags = ((lcd_height > 1) ? LCD_FLAG_N : 0)
| LCD_FLAG_D | LCD_FLAG_C | LCD_FLAG_B; | LCD_FLAG_D | LCD_FLAG_C | LCD_FLAG_B;
@ -1313,7 +1312,7 @@ static void lcd_write_char(char c)
} }
static ssize_t lcd_write(struct file *file, static ssize_t lcd_write(struct file *file,
const char __user *buf, size_t count, loff_t *ppos) const char __user *buf, size_t count, loff_t *ppos)
{ {
const char __user *tmp = buf; const char __user *tmp = buf;
char c; char c;
@ -1590,7 +1589,6 @@ static void lcd_init(void)
static ssize_t keypad_read(struct file *file, static ssize_t keypad_read(struct file *file,
char __user *buf, size_t count, loff_t *ppos) char __user *buf, size_t count, loff_t *ppos)
{ {
unsigned i = *ppos; unsigned i = *ppos;
char __user *tmp = buf; char __user *tmp = buf;
@ -1615,7 +1613,6 @@ static ssize_t keypad_read(struct file *file,
static int keypad_open(struct inode *inode, struct file *file) static int keypad_open(struct inode *inode, struct file *file)
{ {
if (keypad_open_cnt) if (keypad_open_cnt)
return -EBUSY; /* open only once at a time */ return -EBUSY; /* open only once at a time */
@ -1745,8 +1742,8 @@ static inline int input_state_high(struct logical_input *input)
* release function. * release function.
* eg: 0 -(press A)-> A -(press B)-> AB : don't match A's release. * eg: 0 -(press A)-> A -(press B)-> AB : don't match A's release.
*/ */
if (((phys_prev & input->mask) == input->value) if (((phys_prev & input->mask) == input->value) &&
&& ((phys_curr & input->mask) > input->value)) { ((phys_curr & input->mask) > input->value)) {
input->state = INPUT_ST_LOW; /* invalidate */ input->state = INPUT_ST_LOW; /* invalidate */
return 1; return 1;
} }
@ -1801,8 +1798,8 @@ static inline void input_state_falling(struct logical_input *input)
{ {
#if 0 #if 0
/* FIXME !!! same comment as in input_state_high */ /* FIXME !!! same comment as in input_state_high */
if (((phys_prev & input->mask) == input->value) if (((phys_prev & input->mask) == input->value) &&
&& ((phys_curr & input->mask) > input->value)) { ((phys_curr & input->mask) > input->value)) {
input->state = INPUT_ST_LOW; /* invalidate */ input->state = INPUT_ST_LOW; /* invalidate */
return; return;
} }
@ -1960,9 +1957,10 @@ static int input_name2mask(const char *name, pmask_t *mask, pmask_t *value,
while (*name) { while (*name) {
int in, out, bit, neg; int in, out, bit, neg;
for (in = 0; (in < sizeof(sigtab)) && for (in = 0; (in < sizeof(sigtab)) && (sigtab[in] != *name);
(sigtab[in] != *name); in++) in++)
; ;
if (in >= sizeof(sigtab)) if (in >= sizeof(sigtab))
return 0; /* input name not found */ return 0; /* input name not found */
neg = (in & 1); /* odd (lower) names are negated */ neg = (in & 1); /* odd (lower) names are negated */
@ -2005,7 +2003,7 @@ static struct logical_input *panel_bind_key(const char *name, const char *press,
{ {
struct logical_input *key; struct logical_input *key;
key = kzalloc(sizeof(struct logical_input), GFP_KERNEL); key = kzalloc(sizeof(*key), GFP_KERNEL);
if (!key) if (!key)
return NULL; return NULL;
@ -2043,7 +2041,7 @@ static struct logical_input *panel_bind_callback(char *name,
{ {
struct logical_input *callback; struct logical_input *callback;
callback = kmalloc(sizeof(struct logical_input), GFP_KERNEL); callback = kmalloc(sizeof(*callback), GFP_KERNEL);
if (!callback) if (!callback)
return NULL; return NULL;