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
Input: remove use of __devexit
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
keyboard
/
sh_keysc.c
diff --git
a/drivers/input/keyboard/sh_keysc.c
b/drivers/input/keyboard/sh_keysc.c
index da54ad5db154bf8065549779dfba335ef9088d66..fdb9eb2df380c4e50e1fe58bb5f33c6d7cc04897 100644
(file)
--- a/
drivers/input/keyboard/sh_keysc.c
+++ b/
drivers/input/keyboard/sh_keysc.c
@@
-162,7
+162,7
@@
static irqreturn_t sh_keysc_isr(int irq, void *dev_id)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static int
__devinit
sh_keysc_probe(struct platform_device *pdev)
+static int sh_keysc_probe(struct platform_device *pdev)
{
struct sh_keysc_priv *priv;
struct sh_keysc_info *pdata;
{
struct sh_keysc_priv *priv;
struct sh_keysc_info *pdata;
@@
-272,7
+272,7
@@
static int __devinit sh_keysc_probe(struct platform_device *pdev)
return error;
}
return error;
}
-static int
__devexit
sh_keysc_remove(struct platform_device *pdev)
+static int sh_keysc_remove(struct platform_device *pdev)
{
struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
{
struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
@@
-331,7
+331,7
@@
static SIMPLE_DEV_PM_OPS(sh_keysc_dev_pm_ops,
static struct platform_driver sh_keysc_device_driver = {
.probe = sh_keysc_probe,
static struct platform_driver sh_keysc_device_driver = {
.probe = sh_keysc_probe,
- .remove =
__devexit_p(sh_keysc_remove)
,
+ .remove =
sh_keysc_remove
,
.driver = {
.name = "sh_keysc",
.pm = &sh_keysc_dev_pm_ops,
.driver = {
.name = "sh_keysc",
.pm = &sh_keysc_dev_pm_ops,