redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Russell King 2016-08-19 09:41:47 -07:00 committed by Dmitry Torokhov
parent a8a7bdc598
commit 0f631d87d9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-sa1100/jornada720.c
View File

@ -217,9 +217,15 @@ static struct platform_device jornada_ssp_device = {
.id = -1, .id = -1,
}; };
static struct resource jornada_kbd_resources[] = {
DEFINE_RES_IRQ(IRQ_GPIO0),
};
static struct platform_device jornada_kbd_device = { static struct platform_device jornada_kbd_device = {
.name = "jornada720_kbd", .name = "jornada720_kbd",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(jornada_kbd_resources),
.resource = jornada_kbd_resources,
}; };
static struct platform_device jornada_ts_device = { static struct platform_device jornada_ts_device = {

11
drivers/input/keyboard/jornada720_kbd.c
View File

@ -26,7 +26,6 @@
#include <mach/jornada720.h> #include <mach/jornada720.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h>
MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>"); MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>");
MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver"); MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver");
@ -97,7 +96,11 @@ static int jornada720_kbd_probe(struct platform_device *pdev)
{ {
struct jornadakbd *jornadakbd; struct jornadakbd *jornadakbd;
struct input_dev *input_dev; struct input_dev *input_dev;
int i, err; int i, err, irq;
irq = platform_get_irq(pdev, 0);
if (irq <= 0)
return irq < 0 ? irq : -EINVAL;
jornadakbd = devm_kzalloc(&pdev->dev, sizeof(*jornadakbd), GFP_KERNEL); jornadakbd = devm_kzalloc(&pdev->dev, sizeof(*jornadakbd), GFP_KERNEL);
input_dev = devm_input_allocate_device(&pdev->dev); input_dev = devm_input_allocate_device(&pdev->dev);
@ -125,10 +128,10 @@ static int jornada720_kbd_probe(struct platform_device *pdev)
input_set_capability(input_dev, EV_MSC, MSC_SCAN); input_set_capability(input_dev, EV_MSC, MSC_SCAN);
err = devm_request_irq(&pdev->dev, IRQ_GPIO0, jornada720_kbd_interrupt, err = devm_request_irq(&pdev->dev, irq, jornada720_kbd_interrupt,
IRQF_TRIGGER_FALLING, "jornadakbd", pdev); IRQF_TRIGGER_FALLING, "jornadakbd", pdev);
if (err) { if (err) {
printk(KERN_INFO "jornadakbd720_kbd: Unable to grab IRQ\n"); dev_err(&pdev->dev, "unable to grab IRQ%d: %d\n", irq, err);
return err; return err;
} }