Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0f85a82 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] pxa: fix pxa27x keyboard driver 



CKEN macro definitions no longer contains the bit number; remove it
from usages in the pxa27x keyboard driver.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent db002b85

drivers/input/keyboard/pxa27x_keyboard.c

+3 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int pxakbd_open(struct input_dev *dev) 
	KPREC = 0x7F;



	/* Enable unit clock */

	pxa_set_cken(CKEN19_KEYPAD, 1);

	pxa_set_cken(CKEN_KEYPAD, 1);



	return 0;

}
@@ -112,7 +112,7 @@ static int pxakbd_open(struct input_dev *dev) 
static void pxakbd_close(struct input_dev *dev)

{

	/* Disable clock unit */

	pxa_set_cken(CKEN19_KEYPAD, 0);

	pxa_set_cken(CKEN_KEYPAD, 0);

}



#ifdef CONFIG_PM
@@ -185,7 +185,7 @@ static int __devinit pxakbd_probe(struct platform_device *pdev) 
			    DRIVER_NAME, pdev);

	if (error) {

		printk(KERN_ERR "Cannot request keypad IRQ\n");

		pxa_set_cken(CKEN19_KEYPAD, 0);

		pxa_set_cken(CKEN_KEYPAD, 0);

		goto err_free_dev;

	}