Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Input: jornada720_kbd - get rid of mach/irqs.h include
Switch the jornada720 keyboard driver to obtain its interrupt from the
platform device, rather than via a hard-coded interrupt number obtained
from the mach/irqs.h header.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
authored by
Russell King
and committed by
Dmitry Torokhov
0f631d87
a8a7bdc5
+13
-4
+6
arch/arm/mach-sa1100/jornada720.c
+6
arch/arm/mach-sa1100/jornada720.c
···
217
217
.id = -1,
218
218
};
219
219
220
+
static struct resource jornada_kbd_resources[] = {
221
+
DEFINE_RES_IRQ(IRQ_GPIO0),
222
+
};
223
+
220
224
static struct platform_device jornada_kbd_device = {
221
225
.name = "jornada720_kbd",
222
226
.id = -1,
227
+
.num_resources = ARRAY_SIZE(jornada_kbd_resources),
228
+
.resource = jornada_kbd_resources,
223
229
};
224
230
225
231
static struct platform_device jornada_ts_device = {
+7
-4
drivers/input/keyboard/jornada720_kbd.c
+7
-4
drivers/input/keyboard/jornada720_kbd.c
···
26
26
27
27
#include <mach/jornada720.h>
28
28
#include <mach/hardware.h>
29
-
#include <mach/irqs.h>
30
29
31
30
MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>");
32
31
MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver");
···
96
97
{
97
98
struct jornadakbd *jornadakbd;
98
99
struct input_dev *input_dev;
99
-
int i, err;
100
+
int i, err, irq;
101
+
102
+
irq = platform_get_irq(pdev, 0);
103
+
if (irq <= 0)
104
+
return irq < 0 ? irq : -EINVAL;
100
105
101
106
jornadakbd = devm_kzalloc(&pdev->dev, sizeof(*jornadakbd), GFP_KERNEL);
102
107
input_dev = devm_input_allocate_device(&pdev->dev);
···
128
125
129
126
input_set_capability(input_dev, EV_MSC, MSC_SCAN);
130
127
131
-
err = devm_request_irq(&pdev->dev, IRQ_GPIO0, jornada720_kbd_interrupt,
128
+
err = devm_request_irq(&pdev->dev, irq, jornada720_kbd_interrupt,
132
129
IRQF_TRIGGER_FALLING, "jornadakbd", pdev);
133
130
if (err) {
134
-
printk(KERN_INFO "jornadakbd720_kbd: Unable to grab IRQ\n");
131
+
dev_err(&pdev->dev, "unable to grab IRQ%d: %d\n", irq, err);
135
132
return err;
136
133
}
137
134