Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-10-01 09:16:06 +00:00
Code Issues Projects Releases Wiki Activity

Input: whitespace fixes in drivers/input/keyboard

Browse source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2005-05-29 02:28:42 -05:00
parent 968ac842c4
commit d083e90660
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/input/keyboard/atkbd.c
View file

@ -227,7 +227,7 @@ static ssize_t atkbd_do_set_##_name(struct device *d, const char *b, size_t s) \
{ \ { \
return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name); \ return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name); \
} \ } \
static struct device_attribute atkbd_attr_##_name = \ static struct device_attribute atkbd_attr_##_name = \
__ATTR(_name, S_IWUSR | S_IRUGO, atkbd_do_show_##_name, atkbd_do_set_##_name); __ATTR(_name, S_IWUSR | S_IRUGO, atkbd_do_show_##_name, atkbd_do_set_##_name);
ATKBD_DEFINE_ATTR(extra); ATKBD_DEFINE_ATTR(extra);
@ -388,7 +388,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
value = atkbd->release ? 0 : value = atkbd->release ? 0 :
(1 + (!atkbd->softrepeat && test_bit(atkbd->keycode[code], atkbd->dev.key))); (1 + (!atkbd->softrepeat && test_bit(atkbd->keycode[code], atkbd->dev.key)));
switch (value) { /* Workaround Toshiba laptop multiple keypress */ switch (value) { /* Workaround Toshiba laptop multiple keypress */
case 0: case 0:
atkbd->last = 0; atkbd->last = 0;
break; break;
@ -894,7 +894,7 @@ static int atkbd_reconnect(struct serio *serio)
if (atkbd->write) { if (atkbd->write) {
param[0] = (test_bit(LED_SCROLLL, atkbd->dev.led) ? 1 : 0) param[0] = (test_bit(LED_SCROLLL, atkbd->dev.led) ? 1 : 0)
| (test_bit(LED_NUML, atkbd->dev.led) ? 2 : 0) | (test_bit(LED_NUML, atkbd->dev.led) ? 2 : 0)
| (test_bit(LED_CAPSL, atkbd->dev.led) ? 4 : 0); | (test_bit(LED_CAPSL, atkbd->dev.led) ? 4 : 0);
if (atkbd_probe(atkbd)) if (atkbd_probe(atkbd))
return -1; return -1;

8
drivers/input/keyboard/lkkbd.c
View file

@ -15,10 +15,10 @@
* information given below, I will _not_ be liable! * information given below, I will _not_ be liable!
* *
* RJ10 pinout: To DE9: Or DB25: * RJ10 pinout: To DE9: Or DB25:
* 1 - RxD <----> Pin 3 (TxD) <-> Pin 2 (TxD) * 1 - RxD <----> Pin 3 (TxD) <-> Pin 2 (TxD)
* 2 - GND <----> Pin 5 (GND) <-> Pin 7 (GND) * 2 - GND <----> Pin 5 (GND) <-> Pin 7 (GND)
* 4 - TxD <----> Pin 2 (RxD) <-> Pin 3 (RxD) * 4 - TxD <----> Pin 2 (RxD) <-> Pin 3 (RxD)
* 3 - +12V (from HDD drive connector), DON'T connect to DE9 or DB25!!! * 3 - +12V (from HDD drive connector), DON'T connect to DE9 or DB25!!!
* *
* Pin numbers for DE9 and DB25 are noted on the plug (quite small:). For * Pin numbers for DE9 and DB25 are noted on the plug (quite small:). For
* RJ10, it's like this: * RJ10, it's like this:

28
drivers/input/keyboard/locomokbd.c
View file

@ -42,7 +42,7 @@ MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
MODULE_DESCRIPTION("LoCoMo keyboard driver"); MODULE_DESCRIPTION("LoCoMo keyboard driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define LOCOMOKBD_NUMKEYS 128 #define LOCOMOKBD_NUMKEYS 128
#define KEY_ACTIVITY KEY_F16 #define KEY_ACTIVITY KEY_F16
#define KEY_CONTACT KEY_F18 #define KEY_CONTACT KEY_F18
@ -61,7 +61,7 @@ static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */
0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */
KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */
}; };
#define KB_ROWS 16 #define KB_ROWS 16
@ -82,7 +82,7 @@ struct locomokbd {
struct locomo_dev *ldev; struct locomo_dev *ldev;
unsigned long base; unsigned long base;
spinlock_t lock; spinlock_t lock;
struct timer_list timer; struct timer_list timer;
}; };
@ -95,7 +95,7 @@ static inline void locomokbd_charge_all(unsigned long membase)
static inline void locomokbd_activate_all(unsigned long membase) static inline void locomokbd_activate_all(unsigned long membase)
{ {
unsigned long r; unsigned long r;
locomo_writel(0, membase + LOCOMO_KSC); locomo_writel(0, membase + LOCOMO_KSC);
r = locomo_readl(membase + LOCOMO_KIC); r = locomo_readl(membase + LOCOMO_KIC);
r &= 0xFEFF; r &= 0xFEFF;
@ -127,7 +127,7 @@ static inline void locomokbd_reset_col(unsigned long membase, int col)
*/ */
/* Scan the hardware keyboard and push any changes up through the input layer */ /* Scan the hardware keyboard and push any changes up through the input layer */
static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *regs) static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *regs)
{ {
unsigned int row, col, rowd, scancode; unsigned int row, col, rowd, scancode;
unsigned long flags; unsigned long flags;
@ -138,7 +138,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
if (regs) if (regs)
input_regs(&locomokbd->input, regs); input_regs(&locomokbd->input, regs);
locomokbd_charge_all(membase); locomokbd_charge_all(membase);
num_pressed = 0; num_pressed = 0;
@ -146,9 +146,9 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
locomokbd_activate_col(membase, col); locomokbd_activate_col(membase, col);
udelay(KB_DELAY); udelay(KB_DELAY);
rowd = ~locomo_readl(membase + LOCOMO_KIB); rowd = ~locomo_readl(membase + LOCOMO_KIB);
for (row = 0; row < KB_ROWS; row++ ) { for (row = 0; row < KB_ROWS; row++) {
scancode = SCANCODE(col, row); scancode = SCANCODE(col, row);
if (rowd & KB_ROWMASK(row)) { if (rowd & KB_ROWMASK(row)) {
num_pressed += 1; num_pressed += 1;
@ -170,7 +170,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
spin_unlock_irqrestore(&locomokbd->lock, flags); spin_unlock_irqrestore(&locomokbd->lock, flags);
} }
/* /*
* LoCoMo keyboard interrupt handler. * LoCoMo keyboard interrupt handler.
*/ */
static irqreturn_t locomokbd_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t locomokbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
@ -205,8 +205,8 @@ static int locomokbd_probe(struct locomo_dev *dev)
memset(locomokbd, 0, sizeof(struct locomokbd)); memset(locomokbd, 0, sizeof(struct locomokbd));
/* try and claim memory region */ /* try and claim memory region */
if (!request_mem_region((unsigned long) dev->mapbase, if (!request_mem_region((unsigned long) dev->mapbase,
dev->length, dev->length,
LOCOMO_DRIVER_NAME(dev))) { LOCOMO_DRIVER_NAME(dev))) {
ret = -EBUSY; ret = -EBUSY;
printk(KERN_ERR "locomokbd: Can't acquire access to io memory for keyboard\n"); printk(KERN_ERR "locomokbd: Can't acquire access to io memory for keyboard\n");
@ -225,7 +225,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
locomokbd->timer.data = (unsigned long) locomokbd; locomokbd->timer.data = (unsigned long) locomokbd;
locomokbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP); locomokbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
init_input_dev(&locomokbd->input); init_input_dev(&locomokbd->input);
locomokbd->input.keycode = locomokbd->keycode; locomokbd->input.keycode = locomokbd->keycode;
locomokbd->input.keycodesize = sizeof(unsigned char); locomokbd->input.keycodesize = sizeof(unsigned char);
@ -271,11 +271,11 @@ free:
static int locomokbd_remove(struct locomo_dev *dev) static int locomokbd_remove(struct locomo_dev *dev)
{ {
struct locomokbd *locomokbd = locomo_get_drvdata(dev); struct locomokbd *locomokbd = locomo_get_drvdata(dev);
free_irq(dev->irq[0], locomokbd); free_irq(dev->irq[0], locomokbd);
del_timer_sync(&locomokbd->timer); del_timer_sync(&locomokbd->timer);
input_unregister_device(&locomokbd->input); input_unregister_device(&locomokbd->input);
locomo_set_drvdata(dev, NULL); locomo_set_drvdata(dev, NULL);

2
drivers/input/keyboard/maple_keyb.c
View file

@ -1,6 +1,6 @@
/* /*
* $Id: maple_keyb.c,v 1.4 2004/03/22 01:18:15 lethal Exp $ * $Id: maple_keyb.c,v 1.4 2004/03/22 01:18:15 lethal Exp $
* SEGA Dreamcast keyboard driver * SEGA Dreamcast keyboard driver
* Based on drivers/usb/usbkbd.c * Based on drivers/usb/usbkbd.c
*/ */