Commit b350620c authored by Cyrill V. Gorcunov's avatar Cyrill V. Gorcunov Committed by Dmitry Torokhov
Browse files

Input: HIL - handle erros from input_register_device() 



Also some whitespace cleanup.

Signed-off-by: default avatarCyrill V. Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent ff141a03

drivers/input/keyboard/hilkbd.c

+66 −48
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static void poll_finished(void) 
	hil_dev.curdev = 0;

}





static inline void handle_status(unsigned char s, unsigned char c)

{

	if (c & 0x8) {
@@ -143,6 +144,7 @@ static inline void handle_status(unsigned char s, unsigned char c) 
	}

}





static inline void handle_data(unsigned char s, unsigned char c)

{

	if (hil_dev.curdev) {
@@ -152,9 +154,7 @@ static inline void handle_data(unsigned char s, unsigned char c) 
}





/* 

 * Handle HIL interrupts.

 */

/* handle HIL interrupts */

static irqreturn_t hil_interrupt(int irq, void *handle)

{

	unsigned char s, c;
@@ -179,10 +179,8 @@ static irqreturn_t hil_interrupt(int irq, void *handle) 
	return IRQ_HANDLED;

}



/*

 * Send a command to the HIL

 */



/* send a command to the HIL */

static void hil_do(unsigned char cmd, unsigned char *data, unsigned int len)

{

	unsigned long flags;
@@ -200,16 +198,14 @@ static void hil_do(unsigned char cmd, unsigned char *data, unsigned int len) 
}





/*

 * Initialise HIL. 

 */



/* initialise HIL */

static int __init

hil_keyb_init(void)

{

	unsigned char c;

	unsigned int i, kbid;

	wait_queue_head_t hil_wait;

	int err;



	if (hil_dev.dev) {

		return -ENODEV; /* already initialized */
@@ -221,13 +217,23 @@ hil_keyb_init(void) 
	hil_dev.dev->private = &hil_dev;



#if defined(CONFIG_HP300)

	if (!hwreg_present((void *)(HILBASE + HIL_DATA)))

		return -ENODEV;

	

	request_region(HILBASE+HIL_DATA, 2, "hil");

	if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {

		printk(KERN_ERR "HIL: hardware register was not found\n");

		err = -ENODEV;

		goto err1;

	}

	if (!request_region(HILBASE + HIL_DATA, 2, "hil")) {

		printk(KERN_ERR "HIL: IOPORT region already used\n");

		err = -EIO;

		goto err1;

	}

#endif



	request_irq(HIL_IRQ, hil_interrupt, 0, "hil", hil_dev.dev_id);

	err = request_irq(HIL_IRQ, hil_interrupt, 0, "hil", hil_dev.dev_id);

	if (err) {

		printk(KERN_ERR "HIL: Can't get IRQ\n");

		goto err2;

	}



	/* Turn on interrupts */

	hil_do(HIL_INTON, NULL, 0);
@@ -239,17 +245,17 @@ hil_keyb_init(void) 
	init_waitqueue_head(&hil_wait);

	wait_event_interruptible_timeout(hil_wait, hil_dev.valid, 3*HZ);

	if (!hil_dev.valid) {

		printk(KERN_WARNING "HIL: timed out, assuming no keyboard present.\n");

		printk(KERN_WARNING "HIL: timed out, assuming no keyboard present\n");

	}



	c = hil_dev.c;

	hil_dev.valid = 0;

	if (c == 0) {

		kbid = -1;

		printk(KERN_WARNING "HIL: no keyboard present.\n");

		printk(KERN_WARNING "HIL: no keyboard present\n");

	} else {

		kbid = ffz(~c);

		/* printk(KERN_INFO "HIL: keyboard found at id %d\n", kbid); */

		printk(KERN_INFO "HIL: keyboard found at id %d\n", kbid);

	}



	/* set it to raw mode */
@@ -273,13 +279,29 @@ hil_keyb_init(void) 
	hil_dev.dev->id.product	= 0x0001;

	hil_dev.dev->id.version	= 0x0010;



	input_register_device(hil_dev.dev);

	err = input_register_device(hil_dev.dev);

	if (err) {

		printk(KERN_ERR "HIL: Can't register device\n");

		goto err3;

	}

	printk(KERN_INFO "input: %s, ID %d at 0x%08lx (irq %d) found and attached\n",

	       hil_dev.dev->name, kbid, HILBASE, HIL_IRQ);



	return 0;



err3:

	hil_do(HIL_INTOFF, NULL, 0);

	disable_irq(HIL_IRQ);

	free_irq(HIL_IRQ, hil_dev.dev_id);

err2:

	release_region(HILBASE + HIL_DATA, 2);

err1:

	input_free_device(hil_dev.dev);

	hil_dev.dev = NULL;

	return err;

}





#if defined(CONFIG_PARISC)

static int __init

hil_init_chip(struct parisc_device *dev)
@@ -313,9 +335,6 @@ static struct parisc_driver hil_driver = { 
#endif /* CONFIG_PARISC */











static int __init hil_init(void)

{

#if defined(CONFIG_PARISC)
@@ -349,4 +368,3 @@ static void __exit hil_exit(void) 


module_init(hil_init);

module_exit(hil_exit);