git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
omap-keypad.c
diff --git
a/drivers/input/keyboard/omap-keypad.c
b/drivers/input/keyboard/omap-keypad.c
index
69e674e
..
058fa8b
100644
(file)
--- a/
drivers/input/keyboard/omap-keypad.c
+++ b/
drivers/input/keyboard/omap-keypad.c
@@
-101,7
+101,7
@@
static irqreturn_t omap_kp_interrupt(int irq, void *dev_id)
if (cpu_is_omap24xx()) {
int i;
for (i = 0; i < omap_kp->rows; i++)
if (cpu_is_omap24xx()) {
int i;
for (i = 0; i < omap_kp->rows; i++)
- disable_irq(
OMAP_GPIO_IRQ
(row_gpios[i]));
+ disable_irq(
gpio_to_irq
(row_gpios[i]));
} else
/* disable keyboard interrupt and schedule for handling */
omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
} else
/* disable keyboard interrupt and schedule for handling */
omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
@@
-122,14
+122,10
@@
static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state)
/* read the keypad status */
if (cpu_is_omap24xx()) {
/* read the keypad status */
if (cpu_is_omap24xx()) {
- int i;
- for (i = 0; i < omap_kp->rows; i++)
- disable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
-
/* read the keypad status */
for (col = 0; col < omap_kp->cols; col++) {
set_col_gpio_val(omap_kp, ~(1 << col));
/* read the keypad status */
for (col = 0; col < omap_kp->cols; col++) {
set_col_gpio_val(omap_kp, ~(1 << col));
- state[col] = ~(get_row_gpio_val(omap_kp)) & 0x
3
f;
+ state[col] = ~(get_row_gpio_val(omap_kp)) & 0x
f
f;
}
set_col_gpio_val(omap_kp, 0);
}
set_col_gpio_val(omap_kp, 0);
@@
-224,7
+220,7
@@
static void omap_kp_tasklet(unsigned long data)
if (cpu_is_omap24xx()) {
int i;
for (i = 0; i < omap_kp_data->rows; i++)
if (cpu_is_omap24xx()) {
int i;
for (i = 0; i < omap_kp_data->rows; i++)
- enable_irq(
OMAP_GPIO_IRQ
(row_gpios[i]));
+ enable_irq(
gpio_to_irq
(row_gpios[i]));
} else {
omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
kp_cur_group = -1;
} else {
omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
kp_cur_group = -1;
@@
-283,7
+279,7
@@
static int omap_kp_resume(struct platform_device *dev)
#define omap_kp_resume NULL
#endif
#define omap_kp_resume NULL
#endif
-static int __init omap_kp_probe(struct platform_device *pdev)
+static int __
dev
init omap_kp_probe(struct platform_device *pdev)
{
struct omap_kp *omap_kp;
struct input_dev *input_dev;
{
struct omap_kp *omap_kp;
struct input_dev *input_dev;
@@
-397,7
+393,7
@@
static int __init omap_kp_probe(struct platform_device *pdev)
omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
} else {
for (irq_idx = 0; irq_idx < omap_kp->rows; irq_idx++) {
omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
} else {
for (irq_idx = 0; irq_idx < omap_kp->rows; irq_idx++) {
- if (request_irq(
OMAP_GPIO_IRQ
(row_gpios[irq_idx]),
+ if (request_irq(
gpio_to_irq
(row_gpios[irq_idx]),
omap_kp_interrupt,
IRQF_TRIGGER_FALLING,
"omap-keypad", omap_kp) < 0)
omap_kp_interrupt,
IRQF_TRIGGER_FALLING,
"omap-keypad", omap_kp) < 0)
@@
-426,7
+422,7
@@
err1:
return -EINVAL;
}
return -EINVAL;
}
-static int omap_kp_remove(struct platform_device *pdev)
+static int
__devexit
omap_kp_remove(struct platform_device *pdev)
{
struct omap_kp *omap_kp = platform_get_drvdata(pdev);
{
struct omap_kp *omap_kp = platform_get_drvdata(pdev);
@@
-438,7
+434,7
@@
static int omap_kp_remove(struct platform_device *pdev)
gpio_free(col_gpios[i]);
for (i = 0; i < omap_kp->rows; i++) {
gpio_free(row_gpios[i]);
gpio_free(col_gpios[i]);
for (i = 0; i < omap_kp->rows; i++) {
gpio_free(row_gpios[i]);
- free_irq(
OMAP_GPIO_IRQ
(row_gpios[i]), 0);
+ free_irq(
gpio_to_irq
(row_gpios[i]), 0);
}
} else {
omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
}
} else {
omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
@@
-458,7
+454,7
@@
static int omap_kp_remove(struct platform_device *pdev)
static struct platform_driver omap_kp_driver = {
.probe = omap_kp_probe,
static struct platform_driver omap_kp_driver = {
.probe = omap_kp_probe,
- .remove =
omap_kp_remove
,
+ .remove =
__devexit_p(omap_kp_remove)
,
.suspend = omap_kp_suspend,
.resume = omap_kp_resume,
.driver = {
.suspend = omap_kp_suspend,
.resume = omap_kp_resume,
.driver = {
@@
-467,7
+463,7
@@
static struct platform_driver omap_kp_driver = {
},
};
},
};
-static int __
dev
init omap_kp_init(void)
+static int __init omap_kp_init(void)
{
printk(KERN_INFO "OMAP Keypad Driver\n");
return platform_driver_register(&omap_kp_driver);
{
printk(KERN_INFO "OMAP Keypad Driver\n");
return platform_driver_register(&omap_kp_driver);