Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267509
b: refs/heads/master
c: 88d94e3
h: refs/heads/master
i:
  267507: c10349a
v: v3
  • Loading branch information
Colin Brophy authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 1b28622 commit 5ca5f67
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fe39f945bac555165962b58f0cafa5fbfa3d5724
refs/heads/master: 88d94e301e416f672b2991af3404aebfb6277b2c
22 changes: 11 additions & 11 deletions trunk/drivers/staging/nvec/nvec_kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "nvec-keytable.h"
#include "nvec.h"

#define ACK_KBD_EVENT {'\x05','\xed','\x01'}
#define ACK_KBD_EVENT {'\x05', '\xed', '\x01'}

static unsigned char keycodes[ARRAY_SIZE(code_tab_102us)
+ ARRAY_SIZE(extcode_tab_us102)];
Expand All @@ -27,10 +27,10 @@ static int nvec_keys_notifier(struct notifier_block *nb,
nvec_size _size = (msg[0] & (3 << 5)) >> 5;

/* power on/off button */
if(_size == NVEC_VAR_SIZE)
if (_size == NVEC_VAR_SIZE)
return NOTIFY_STOP;

if(_size == NVEC_3BYTES)
if (_size == NVEC_3BYTES)
msg++;

code = msg[1] & 0x7f;
Expand All @@ -51,13 +51,13 @@ static int nvec_kbd_event(struct input_dev *dev, unsigned int type,
unsigned char buf[] = ACK_KBD_EVENT;
struct nvec_chip *nvec = keys_dev.nvec;

if(type==EV_REP)
if (type == EV_REP)
return 0;

if(type!=EV_LED)
if (type != EV_LED)
return -1;

if(code!=LED_CAPSL)
if (code != LED_CAPSL)
return -1;

buf[2] = !!value;
Expand All @@ -73,11 +73,11 @@ int __init nvec_kbd_init(struct nvec_chip *nvec)

j = 0;

for(i = 0; i < ARRAY_SIZE(code_tab_102us); ++i)
for (i = 0; i < ARRAY_SIZE(code_tab_102us); ++i)
keycodes[j++] = code_tab_102us[i];

for(i = 0; i < ARRAY_SIZE(extcode_tab_us102); ++i)
keycodes[j++]=extcode_tab_us102[i];
for (i = 0; i < ARRAY_SIZE(extcode_tab_us102); ++i)
keycodes[j++] = extcode_tab_us102[i];

idev = input_allocate_device();
idev->name = "Tegra nvec keyboard";
Expand All @@ -89,12 +89,12 @@ int __init nvec_kbd_init(struct nvec_chip *nvec)
idev->keycodesize = sizeof(unsigned char);
idev->keycodemax = ARRAY_SIZE(keycodes);

for( i = 0; i < ARRAY_SIZE(keycodes); ++i)
for (i = 0; i < ARRAY_SIZE(keycodes); ++i)
set_bit(keycodes[i], idev->keybit);

clear_bit(0, idev->keybit);
err = input_register_device(idev);
if(err)
if (err)
goto fail;

keys_dev.input = idev;
Expand Down

0 comments on commit 5ca5f67

Please sign in to comment.