projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
keyboard
/
jornada720_kbd.c
diff --git
a/drivers/input/keyboard/jornada720_kbd.c
b/drivers/input/keyboard/jornada720_kbd.c
index 9d639fa1afbd6efc7c223750ab475d4ebc79087d..5ceef636df2f8f345d143833e4059c3b18510776 100644
(file)
--- a/
drivers/input/keyboard/jornada720_kbd.c
+++ b/
drivers/input/keyboard/jornada720_kbd.c
@@
-94,7
+94,7
@@
static irqreturn_t jornada720_kbd_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
};
return IRQ_HANDLED;
};
-static int
__devinit
jornada720_kbd_probe(struct platform_device *pdev)
+static int jornada720_kbd_probe(struct platform_device *pdev)
{
struct jornadakbd *jornadakbd;
struct input_dev *input_dev;
{
struct jornadakbd *jornadakbd;
struct input_dev *input_dev;
@@
-152,7
+152,7
@@
static int __devinit jornada720_kbd_probe(struct platform_device *pdev)
return err;
};
return err;
};
-static int
__devexit
jornada720_kbd_remove(struct platform_device *pdev)
+static int jornada720_kbd_remove(struct platform_device *pdev)
{
struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);
{
struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);
@@
-173,6
+173,6
@@
static struct platform_driver jornada720_kbd_driver = {
.owner = THIS_MODULE,
},
.probe = jornada720_kbd_probe,
.owner = THIS_MODULE,
},
.probe = jornada720_kbd_probe,
- .remove =
__devexit_p(jornada720_kbd_remove)
,
+ .remove =
jornada720_kbd_remove
,
};
module_platform_driver(jornada720_kbd_driver);
};
module_platform_driver(jornada720_kbd_driver);