leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: lkkbd - change formatting style to match the rest of the kernel

Browse Source 
- no spaces between function name and opening parenthesis
 - switch statements were indented too much

This makes checkpatch (and me) happy.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2009-10-13 23:36:00 -07:00
parent fb5bbee0dd
commit 7d3fadd148
1 changed files with 226 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

472
drivers/input/keyboard/lkkbd.c
View File

@ -72,9 +72,9 @@
#define DRIVER_DESC "LK keyboard driver" #define DRIVER_DESC "LK keyboard driver"
MODULE_AUTHOR ("Jan-Benedict Glaw <jbglaw@lug-owl.de>"); MODULE_AUTHOR("Jan-Benedict Glaw <jbglaw@lug-owl.de>");
MODULE_DESCRIPTION (DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE ("GPL"); MODULE_LICENSE("GPL");
/* /*
* Known parameters: * Known parameters:
@ -85,27 +85,27 @@ MODULE_LICENSE ("GPL");
* Please notice that there's not yet an API to set these at runtime. * Please notice that there's not yet an API to set these at runtime.
*/ */
static int bell_volume = 100; /* % */ static int bell_volume = 100; /* % */
module_param (bell_volume, int, 0); module_param(bell_volume, int, 0);
MODULE_PARM_DESC (bell_volume, "Bell volume (in %). default is 100%"); MODULE_PARM_DESC(bell_volume, "Bell volume (in %). default is 100%");
static int keyclick_volume = 100; /* % */ static int keyclick_volume = 100; /* % */
module_param (keyclick_volume, int, 0); module_param(keyclick_volume, int, 0);
MODULE_PARM_DESC (keyclick_volume, "Keyclick volume (in %), default is 100%"); MODULE_PARM_DESC(keyclick_volume, "Keyclick volume (in %), default is 100%");
static int ctrlclick_volume = 100; /* % */ static int ctrlclick_volume = 100; /* % */
module_param (ctrlclick_volume, int, 0); module_param(ctrlclick_volume, int, 0);
MODULE_PARM_DESC (ctrlclick_volume, "Ctrlclick volume (in %), default is 100%"); MODULE_PARM_DESC(ctrlclick_volume, "Ctrlclick volume (in %), default is 100%");
static int lk201_compose_is_alt; static int lk201_compose_is_alt;
module_param (lk201_compose_is_alt, int, 0); module_param(lk201_compose_is_alt, int, 0);
MODULE_PARM_DESC (lk201_compose_is_alt, "If set non-zero, LK201' Compose key " MODULE_PARM_DESC(lk201_compose_is_alt,
"will act as an Alt key"); "If set non-zero, LK201' Compose key will act as an Alt key");
#undef LKKBD_DEBUG #undef LKKBD_DEBUG
#ifdef LKKBD_DEBUG #ifdef LKKBD_DEBUG
#define DBG(x...) printk (x) #define DBG(x...) printk(x)
#else #else
#define DBG(x...) do {} while (0) #define DBG(x...) do {} while (0)
#endif #endif
@ -122,7 +122,7 @@ MODULE_PARM_DESC (lk201_compose_is_alt, "If set non-zero, LK201' Compose key "
#define LK_MODE_DOWN 0x80 #define LK_MODE_DOWN 0x80
#define LK_MODE_AUTODOWN 0x82 #define LK_MODE_AUTODOWN 0x82
#define LK_MODE_UPDOWN 0x86 #define LK_MODE_UPDOWN 0x86
#define LK_CMD_SET_MODE(mode,div) ((mode) | ((div) << 3)) #define LK_CMD_SET_MODE(mode, div) ((mode) | ((div) << 3))
/* Misc commands */ /* Misc commands */
#define LK_CMD_ENABLE_KEYCLICK 0x1b #define LK_CMD_ENABLE_KEYCLICK 0x1b
@ -152,11 +152,8 @@ MODULE_PARM_DESC (lk201_compose_is_alt, "If set non-zero, LK201' Compose key "
#define LK_NUM_KEYCODES 256 #define LK_NUM_KEYCODES 256
#define LK_NUM_IGNORE_BYTES 6 #define LK_NUM_IGNORE_BYTES 6
typedef u_int16_t lk_keycode_t;
static unsigned short lkkbd_keycode[LK_NUM_KEYCODES] = {
static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = {
[0x56] = KEY_F1, [0x56] = KEY_F1,
[0x57] = KEY_F2, [0x57] = KEY_F2,
[0x58] = KEY_F3, [0x58] = KEY_F3,
@ -268,7 +265,7 @@ static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = {
}; };
#define CHECK_LED(LK, VAR_ON, VAR_OFF, LED, BITS) do { \ #define CHECK_LED(LK, VAR_ON, VAR_OFF, LED, BITS) do { \
if (test_bit (LED, (LK)->dev->led)) \ if (test_bit(LED, (LK)->dev->led)) \
VAR_ON |= BITS; \ VAR_ON |= BITS; \
else \ else \
VAR_OFF |= BITS; \ VAR_OFF |= BITS; \
@ -278,7 +275,7 @@ static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = {
* Per-keyboard data * Per-keyboard data
*/ */
struct lkkbd { struct lkkbd {
lk_keycode_t keycode[LK_NUM_KEYCODES]; unsigned short keycode[LK_NUM_KEYCODES];
int ignore_bytes; int ignore_bytes;
unsigned char id[LK_NUM_IGNORE_BYTES]; unsigned char id[LK_NUM_IGNORE_BYTES];
struct input_dev *dev; struct input_dev *dev;
@ -301,26 +298,25 @@ static struct {
unsigned char *name; unsigned char *name;
} lk_response[] = { } lk_response[] = {
#define RESPONSE(x) { .value = (x), .name = #x, } #define RESPONSE(x) { .value = (x), .name = #x, }
RESPONSE (LK_STUCK_KEY), RESPONSE(LK_STUCK_KEY),
RESPONSE (LK_SELFTEST_FAILED), RESPONSE(LK_SELFTEST_FAILED),
RESPONSE (LK_ALL_KEYS_UP), RESPONSE(LK_ALL_KEYS_UP),
RESPONSE (LK_METRONOME), RESPONSE(LK_METRONOME),
RESPONSE (LK_OUTPUT_ERROR), RESPONSE(LK_OUTPUT_ERROR),
RESPONSE (LK_INPUT_ERROR), RESPONSE(LK_INPUT_ERROR),
RESPONSE (LK_KBD_LOCKED), RESPONSE(LK_KBD_LOCKED),
RESPONSE (LK_KBD_TEST_MODE_ACK), RESPONSE(LK_KBD_TEST_MODE_ACK),
RESPONSE (LK_PREFIX_KEY_DOWN), RESPONSE(LK_PREFIX_KEY_DOWN),
RESPONSE (LK_MODE_CHANGE_ACK), RESPONSE(LK_MODE_CHANGE_ACK),
RESPONSE (LK_RESPONSE_RESERVED), RESPONSE(LK_RESPONSE_RESERVED),
#undef RESPONSE #undef RESPONSE
}; };
static unsigned char * static unsigned char *response_name(unsigned char value)
response_name (unsigned char value)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE (lk_response); i++) for (i = 0; i < ARRAY_SIZE(lk_response); i++)
if (lk_response[i].value == value) if (lk_response[i].value == value)
return lk_response[i].name; return lk_response[i].name;
@ -331,8 +327,7 @@ response_name (unsigned char value)
/* /*
* Calculate volume parameter byte for a given volume. * Calculate volume parameter byte for a given volume.
*/ */
static unsigned char static unsigned char volume_to_hw(int volume_percent)
volume_to_hw (int volume_percent)
{ {
unsigned char ret = 0; unsigned char ret = 0;
@ -363,8 +358,7 @@ volume_to_hw (int volume_percent)
return ret; return ret;
} }
static void static void lkkbd_detection_done(struct lkkbd *lk)
lkkbd_detection_done (struct lkkbd *lk)
{ {
int i; int i;
@ -377,190 +371,202 @@ lkkbd_detection_done (struct lkkbd *lk)
* Print keyboard name and modify Compose=Alt on user's request. * Print keyboard name and modify Compose=Alt on user's request.
*/ */
switch (lk->id[4]) { switch (lk->id[4]) {
case 1: case 1:
strlcpy (lk->name, "DEC LK201 keyboard", strlcpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name));
sizeof (lk->name));
if (lk201_compose_is_alt) if (lk201_compose_is_alt)
lk->keycode[0xb1] = KEY_LEFTALT; lk->keycode[0xb1] = KEY_LEFTALT;
break; break;
case 2: case 2:
strlcpy (lk->name, "DEC LK401 keyboard", strlcpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name));
sizeof (lk->name)); break;
break;
default: default:
strlcpy (lk->name, "Unknown DEC keyboard", strlcpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name));
sizeof (lk->name)); printk(KERN_ERR
printk (KERN_ERR "lkkbd: keyboard on %s is unknown, " "lkkbd: keyboard on %s is unknown, please report to "
"please report to Jan-Benedict Glaw " "Jan-Benedict Glaw <jbglaw@lug-owl.de>\n", lk->phys);
"<jbglaw@lug-owl.de>\n", lk->phys); printk(KERN_ERR "lkkbd: keyboard ID'ed as:");
printk (KERN_ERR "lkkbd: keyboard ID'ed as:"); for (i = 0; i < LK_NUM_IGNORE_BYTES; i++)
for (i = 0; i < LK_NUM_IGNORE_BYTES; i++) printk(" 0x%02x", lk->id[i]);
printk (" 0x%02x", lk->id[i]); printk("\n");
printk ("\n"); break;
break;
} }
printk (KERN_INFO "lkkbd: keyboard on %s identified as: %s\n",
lk->phys, lk->name); printk(KERN_INFO "lkkbd: keyboard on %s identified as: %s\n",
lk->phys, lk->name);
/* /*
* Report errors during keyboard boot-up. * Report errors during keyboard boot-up.
*/ */
switch (lk->id[2]) { switch (lk->id[2]) {
case 0x00: case 0x00:
/* All okay */ /* All okay */
break; break;
case LK_STUCK_KEY: case LK_STUCK_KEY:
printk (KERN_ERR "lkkbd: Stuck key on keyboard at " printk(KERN_ERR "lkkbd: Stuck key on keyboard at %s\n",
"%s\n", lk->phys); lk->phys);
break; break;
case LK_SELFTEST_FAILED: case LK_SELFTEST_FAILED:
printk (KERN_ERR "lkkbd: Selftest failed on keyboard " printk(KERN_ERR
"at %s, keyboard may not work " "lkkbd: Selftest failed on keyboard at %s, "
"properly\n", lk->phys); "keyboard may not work properly\n", lk->phys);
break; break;
default: default:
printk (KERN_ERR "lkkbd: Unknown error %02x on " printk(KERN_ERR
"keyboard at %s\n", lk->id[2], "lkkbd: Unknown error %02x on keyboard at %s\n",
lk->phys); lk->id[2], lk->phys);
break; break;
} }
/* /*
* Try to hint user if there's a stuck key. * Try to hint user if there's a stuck key.
*/ */
if (lk->id[2] == LK_STUCK_KEY && lk->id[3] != 0) if (lk->id[2] == LK_STUCK_KEY && lk->id[3] != 0)
printk (KERN_ERR "Scancode of stuck key is 0x%02x, keycode " printk(KERN_ERR
"is 0x%04x\n", lk->id[3], "Scancode of stuck key is 0x%02x, keycode is 0x%04x\n",
lk->keycode[lk->id[3]]); lk->id[3], lk->keycode[lk->id[3]]);
return;
} }
/* /*
* lkkbd_interrupt() is called by the low level driver when a character * lkkbd_interrupt() is called by the low level driver when a character
* is received. * is received.
*/ */
static irqreturn_t static irqreturn_t lkkbd_interrupt(struct serio *serio,
lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags) unsigned char data, unsigned int flags)
{ {
struct lkkbd *lk = serio_get_drvdata (serio); struct lkkbd *lk = serio_get_drvdata(serio);
struct input_dev *input_dev = lk->dev;
unsigned int keycode;
int i; int i;
DBG (KERN_INFO "Got byte 0x%02x\n", data); DBG(KERN_INFO "Got byte 0x%02x\n", data);
if (lk->ignore_bytes > 0) { if (lk->ignore_bytes > 0) {
DBG (KERN_INFO "Ignoring a byte on %s\n", lk->name); DBG(KERN_INFO "Ignoring a byte on %s\n", lk->name);
lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data; lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data;
if (lk->ignore_bytes == 0) if (lk->ignore_bytes == 0)
lkkbd_detection_done (lk); lkkbd_detection_done(lk);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
switch (data) { switch (data) {
case LK_ALL_KEYS_UP: case LK_ALL_KEYS_UP:
for (i = 0; i < ARRAY_SIZE (lkkbd_keycode); i++) for (i = 0; i < ARRAY_SIZE(lkkbd_keycode); i++)
if (lk->keycode[i] != KEY_RESERVED) input_report_key(input_dev, lk->keycode[i], 0);
input_report_key (lk->dev, lk->keycode[i], 0); input_sync(input_dev);
input_sync (lk->dev); break;
break;
case 0x01: case 0x01:
DBG (KERN_INFO "Got 0x01, scheduling re-initialization\n"); DBG(KERN_INFO "Got 0x01, scheduling re-initialization\n");
lk->ignore_bytes = LK_NUM_IGNORE_BYTES; lk->ignore_bytes = LK_NUM_IGNORE_BYTES;
lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data; lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data;
schedule_work (&lk->tq); schedule_work(&lk->tq);
break; break;
case LK_METRONOME: case LK_METRONOME:
case LK_OUTPUT_ERROR: case LK_OUTPUT_ERROR:
case LK_INPUT_ERROR: case LK_INPUT_ERROR:
case LK_KBD_LOCKED: case LK_KBD_LOCKED:
case LK_KBD_TEST_MODE_ACK: case LK_KBD_TEST_MODE_ACK:
case LK_PREFIX_KEY_DOWN: case LK_PREFIX_KEY_DOWN:
case LK_MODE_CHANGE_ACK: case LK_MODE_CHANGE_ACK:
case LK_RESPONSE_RESERVED: case LK_RESPONSE_RESERVED:
DBG (KERN_INFO "Got %s and don't know how to handle...\n", DBG(KERN_INFO "Got %s and don't know how to handle...\n",
response_name (data)); response_name(data));
break; break;
default: default:
if (lk->keycode[data] != KEY_RESERVED) { keycode = lk->keycode[data];
if (!test_bit (lk->keycode[data], lk->dev->key)) if (keycode != KEY_RESERVED) {
input_report_key (lk->dev, lk->keycode[data], 1); input_report_key(input_dev, keycode,
else !test_bit(keycode, input_dev->key));
input_report_key (lk->dev, lk->keycode[data], 0); input_sync(input_dev);
input_sync (lk->dev); } else {
} else printk(KERN_WARNING
printk (KERN_WARNING "%s: Unknown key with " "%s: Unknown key with scancode 0x%02x on %s.\n",
"scancode 0x%02x on %s.\n", __FILE__, data, lk->name);
__FILE__, data, lk->name); }
} }
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* static void lkkbd_toggle_leds(struct lkkbd *lk)
* lkkbd_event() handles events from the input module.
*/
static int
lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
int value)
{ {
struct lkkbd *lk = input_get_drvdata (dev); struct serio *serio = lk->serio;
unsigned char leds_on = 0; unsigned char leds_on = 0;
unsigned char leds_off = 0; unsigned char leds_off = 0;
CHECK_LED(lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK);
CHECK_LED(lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE);
CHECK_LED(lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
CHECK_LED(lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
if (leds_on != 0) {
serio_write(serio, LK_CMD_LED_ON);
serio_write(serio, leds_on);
}
if (leds_off != 0) {
serio_write(serio, LK_CMD_LED_OFF);
serio_write(serio, leds_off);
}
}
static void lkkbd_toggle_keyclick(struct lkkbd *lk, bool on)
{
struct serio *serio = lk->serio;
if (on) {
DBG("%s: Activating key clicks\n", __func__);
serio_write(serio, LK_CMD_ENABLE_KEYCLICK);
serio_write(serio, volume_to_hw(lk->keyclick_volume));
serio_write(serio, LK_CMD_ENABLE_CTRCLICK);
serio_write(serio, volume_to_hw(lk->ctrlclick_volume));
} else {
DBG("%s: Deactivating key clicks\n", __func__);
serio_write(serio, LK_CMD_DISABLE_KEYCLICK);
serio_write(serio, LK_CMD_DISABLE_CTRCLICK);
}
}
/*
* lkkbd_event() handles events from the input module.
*/
static int lkkbd_event(struct input_dev *dev,
unsigned int type, unsigned int code, int value)
{
struct lkkbd *lk = input_get_drvdata(dev);
switch (type) { switch (type) {
case EV_LED: case EV_LED:
CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK); lkkbd_toggle_leds(lk);
CHECK_LED (lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE); return 0;
CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT); case EV_SND:
if (leds_on != 0) { switch (code) {
serio_write (lk->serio, LK_CMD_LED_ON); case SND_CLICK:
serio_write (lk->serio, leds_on); lkkbd_toggle_keyclick(lk, value);
}
if (leds_off != 0) {
serio_write (lk->serio, LK_CMD_LED_OFF);
serio_write (lk->serio, leds_off);
}
return 0; return 0;
case EV_SND: case SND_BELL:
switch (code) { if (value != 0)
case SND_CLICK: serio_write(lk->serio, LK_CMD_SOUND_BELL);
if (value == 0) {
DBG ("%s: Deactivating key clicks\n", __func__);
serio_write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
serio_write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
} else {
DBG ("%s: Activating key clicks\n", __func__);
serio_write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
serio_write (lk->serio, volume_to_hw (lk->keyclick_volume));
serio_write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
serio_write (lk->serio, volume_to_hw (lk->ctrlclick_volume));
}
return 0;
case SND_BELL: return 0;
if (value != 0) }
serio_write (lk->serio, LK_CMD_SOUND_BELL);
return 0; break;
}
break;
default: default:
printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n", printk(KERN_ERR "%s(): Got unknown type %d, code %d, value %d\n",
__func__, type, code, value); __func__, type, code, value);
} }
return -1; return -1;
@ -570,79 +576,56 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
* lkkbd_reinit() sets leds and beeps to a state the computer remembers they * lkkbd_reinit() sets leds and beeps to a state the computer remembers they
* were in. * were in.
*/ */
static void static void lkkbd_reinit(struct work_struct *work)
lkkbd_reinit (struct work_struct *work)
{ {
struct lkkbd *lk = container_of(work, struct lkkbd, tq); struct lkkbd *lk = container_of(work, struct lkkbd, tq);
int division; int division;
unsigned char leds_on = 0;
unsigned char leds_off = 0;
/* Ask for ID */ /* Ask for ID */
serio_write (lk->serio, LK_CMD_REQUEST_ID); serio_write(lk->serio, LK_CMD_REQUEST_ID);
/* Reset parameters */ /* Reset parameters */
serio_write (lk->serio, LK_CMD_SET_DEFAULTS); serio_write(lk->serio, LK_CMD_SET_DEFAULTS);
/* Set LEDs */ /* Set LEDs */
CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK); lkkbd_toggle_leds(lk);
CHECK_LED (lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE);
CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
if (leds_on != 0) {
serio_write (lk->serio, LK_CMD_LED_ON);
serio_write (lk->serio, leds_on);
}
if (leds_off != 0) {
serio_write (lk->serio, LK_CMD_LED_OFF);
serio_write (lk->serio, leds_off);
}
/* /*
* Try to activate extended LK401 mode. This command will * Try to activate extended LK401 mode. This command will
* only work with a LK401 keyboard and grants access to * only work with a LK401 keyboard and grants access to
* LAlt, RAlt, RCompose and RShift. * LAlt, RAlt, RCompose and RShift.
*/ */
serio_write (lk->serio, LK_CMD_ENABLE_LK401); serio_write(lk->serio, LK_CMD_ENABLE_LK401);
/* Set all keys to UPDOWN mode */ /* Set all keys to UPDOWN mode */
for (division = 1; division <= 14; division++) for (division = 1; division <= 14; division++)
serio_write (lk->serio, LK_CMD_SET_MODE (LK_MODE_UPDOWN, serio_write(lk->serio,
division)); LK_CMD_SET_MODE(LK_MODE_UPDOWN, division));
/* Enable bell and set volume */ /* Enable bell and set volume */
serio_write (lk->serio, LK_CMD_ENABLE_BELL); serio_write(lk->serio, LK_CMD_ENABLE_BELL);
serio_write (lk->serio, volume_to_hw (lk->bell_volume)); serio_write(lk->serio, volume_to_hw(lk->bell_volume));
/* Enable/disable keyclick (and possibly set volume) */ /* Enable/disable keyclick (and possibly set volume) */
if (test_bit (SND_CLICK, lk->dev->snd)) { lkkbd_toggle_keyclick(lk, test_bit(SND_CLICK, lk->dev->snd));
serio_write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
serio_write (lk->serio, volume_to_hw (lk->keyclick_volume));
serio_write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
serio_write (lk->serio, volume_to_hw (lk->ctrlclick_volume));
} else {
serio_write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
serio_write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
}
/* Sound the bell if needed */ /* Sound the bell if needed */
if (test_bit (SND_BELL, lk->dev->snd)) if (test_bit(SND_BELL, lk->dev->snd))
serio_write (lk->serio, LK_CMD_SOUND_BELL); serio_write(lk->serio, LK_CMD_SOUND_BELL);
} }
/* /*
* lkkbd_connect() probes for a LK keyboard and fills the necessary structures. * lkkbd_connect() probes for a LK keyboard and fills the necessary structures.
*/ */
static int static int lkkbd_connect(struct serio *serio, struct serio_driver *drv)
lkkbd_connect (struct serio *serio, struct serio_driver *drv)
{ {
struct lkkbd *lk; struct lkkbd *lk;
struct input_dev *input_dev; struct input_dev *input_dev;
int i; int i;
int err; int err;
lk = kzalloc (sizeof (struct lkkbd), GFP_KERNEL); lk = kzalloc(sizeof(struct lkkbd), GFP_KERNEL);
input_dev = input_allocate_device (); input_dev = input_allocate_device();
if (!lk || !input_dev) { if (!lk || !input_dev) {
err = -ENOMEM; err = -ENOMEM;
goto fail1; goto fail1;
@ -650,14 +633,14 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
lk->serio = serio; lk->serio = serio;
lk->dev = input_dev; lk->dev = input_dev;
INIT_WORK (&lk->tq, lkkbd_reinit); INIT_WORK(&lk->tq, lkkbd_reinit);
lk->bell_volume = bell_volume; lk->bell_volume = bell_volume;
lk->keyclick_volume = keyclick_volume; lk->keyclick_volume = keyclick_volume;
lk->ctrlclick_volume = ctrlclick_volume; lk->ctrlclick_volume = ctrlclick_volume;
memcpy (lk->keycode, lkkbd_keycode, sizeof (lk_keycode_t) * LK_NUM_KEYCODES); memcpy(lk->keycode, lkkbd_keycode, sizeof(lk->keycode));
strlcpy (lk->name, "DEC LK keyboard", sizeof(lk->name)); strlcpy(lk->name, "DEC LK keyboard", sizeof(lk->name));
snprintf (lk->phys, sizeof(lk->phys), "%s/input0", serio->phys); snprintf(lk->phys, sizeof(lk->phys), "%s/input0", serio->phys);
input_dev->name = lk->name; input_dev->name = lk->name;
input_dev->phys = lk->phys; input_dev->phys = lk->phys;
@ -668,62 +651,61 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
input_dev->dev.parent = &serio->dev; input_dev->dev.parent = &serio->dev;
input_dev->event = lkkbd_event; input_dev->event = lkkbd_event;
input_set_drvdata (input_dev, lk); input_set_drvdata(input_dev, lk);
set_bit (EV_KEY, input_dev->evbit); __set_bit(EV_KEY, input_dev->evbit);
set_bit (EV_LED, input_dev->evbit); __set_bit(EV_LED, input_dev->evbit);
set_bit (EV_SND, input_dev->evbit); __set_bit(EV_SND, input_dev->evbit);
set_bit (EV_REP, input_dev->evbit); __set_bit(EV_REP, input_dev->evbit);
set_bit (LED_CAPSL, input_dev->ledbit); __set_bit(LED_CAPSL, input_dev->ledbit);
set_bit (LED_SLEEP, input_dev->ledbit); __set_bit(LED_SLEEP, input_dev->ledbit);
set_bit (LED_COMPOSE, input_dev->ledbit); __set_bit(LED_COMPOSE, input_dev->ledbit);
set_bit (LED_SCROLLL, input_dev->ledbit); __set_bit(LED_SCROLLL, input_dev->ledbit);
set_bit (SND_BELL, input_dev->sndbit); __set_bit(SND_BELL, input_dev->sndbit);
set_bit (SND_CLICK, input_dev->sndbit); __set_bit(SND_CLICK, input_dev->sndbit);
input_dev->keycode = lk->keycode; input_dev->keycode = lk->keycode;
input_dev->keycodesize = sizeof (lk_keycode_t); input_dev->keycodesize = sizeof(lk->keycode[0]);
input_dev->keycodemax = LK_NUM_KEYCODES; input_dev->keycodemax = ARRAY_SIZE(lk->keycode);
for (i = 0; i < LK_NUM_KEYCODES; i++) for (i = 0; i < LK_NUM_KEYCODES; i++)
__set_bit (lk->keycode[i], input_dev->keybit); __set_bit(lk->keycode[i], input_dev->keybit);
__clear_bit(KEY_RESERVED, input_dev->keybit); __clear_bit(KEY_RESERVED, input_dev->keybit);
serio_set_drvdata (serio, lk); serio_set_drvdata(serio, lk);
err = serio_open (serio, drv); err = serio_open(serio, drv);
if (err) if (err)
goto fail2; goto fail2;
err = input_register_device (lk->dev); err = input_register_device(lk->dev);
if (err) if (err)
goto fail3; goto fail3;
serio_write (lk->serio, LK_CMD_POWERCYCLE_RESET); serio_write(lk->serio, LK_CMD_POWERCYCLE_RESET);
return 0; return 0;
fail3: serio_close (serio); fail3: serio_close(serio);
fail2: serio_set_drvdata (serio, NULL); fail2: serio_set_drvdata(serio, NULL);
fail1: input_free_device (input_dev); fail1: input_free_device(input_dev);
kfree (lk); kfree(lk);
return err; return err;
} }
/* /*
* lkkbd_disconnect() unregisters and closes behind us. * lkkbd_disconnect() unregisters and closes behind us.
*/ */
static void static void lkkbd_disconnect(struct serio *serio)
lkkbd_disconnect (struct serio *serio)
{ {
struct lkkbd *lk = serio_get_drvdata (serio); struct lkkbd *lk = serio_get_drvdata(serio);
input_get_device (lk->dev); input_get_device(lk->dev);
input_unregister_device (lk->dev); input_unregister_device(lk->dev);
serio_close (serio); serio_close(serio);
serio_set_drvdata (serio, NULL); serio_set_drvdata(serio, NULL);
input_put_device (lk->dev); input_put_device(lk->dev);
kfree (lk); kfree(lk);
} }
static struct serio_device_id lkkbd_serio_ids[] = { static struct serio_device_id lkkbd_serio_ids[] = {
@ -752,18 +734,16 @@ static struct serio_driver lkkbd_drv = {
/* /*
* The functions for insering/removing us as a module. * The functions for insering/removing us as a module.
*/ */
static int __init static int __init lkkbd_init(void)
lkkbd_init (void)
{ {
return serio_register_driver(&lkkbd_drv); return serio_register_driver(&lkkbd_drv);
} }
static void __exit static void __exit lkkbd_exit(void)
lkkbd_exit (void)
{ {
serio_unregister_driver(&lkkbd_drv); serio_unregister_driver(&lkkbd_drv);
} }
module_init (lkkbd_init); module_init(lkkbd_init);
module_exit (lkkbd_exit); module_exit(lkkbd_exit);