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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
platform
/
x86
/
xo1-rfkill.c
diff --git
a/drivers/platform/x86/xo1-rfkill.c
b/drivers/platform/x86/xo1-rfkill.c
index 1da13ed34b04f9f944c7bb869f4dcafb5c036e46..4bd17248dfc612c627bede36e6a3ebc64fca43f7 100644
(file)
--- a/
drivers/platform/x86/xo1-rfkill.c
+++ b/
drivers/platform/x86/xo1-rfkill.c
@@
-40,7
+40,7
@@
static const struct rfkill_ops rfkill_ops = {
.set_block = rfkill_set_block,
};
.set_block = rfkill_set_block,
};
-static int
__devinit
xo1_rfkill_probe(struct platform_device *pdev)
+static int xo1_rfkill_probe(struct platform_device *pdev)
{
struct rfkill *rfk;
int r;
{
struct rfkill *rfk;
int r;
@@
-60,7
+60,7
@@
static int __devinit xo1_rfkill_probe(struct platform_device *pdev)
return 0;
}
return 0;
}
-static int
__devexit
xo1_rfkill_remove(struct platform_device *pdev)
+static int xo1_rfkill_remove(struct platform_device *pdev)
{
struct rfkill *rfk = platform_get_drvdata(pdev);
rfkill_unregister(rfk);
{
struct rfkill *rfk = platform_get_drvdata(pdev);
rfkill_unregister(rfk);
@@
-74,7
+74,7
@@
static struct platform_driver xo1_rfkill_driver = {
.owner = THIS_MODULE,
},
.probe = xo1_rfkill_probe,
.owner = THIS_MODULE,
},
.probe = xo1_rfkill_probe,
- .remove =
__devexit_p(xo1_rfkill_remove)
,
+ .remove =
xo1_rfkill_remove
,
};
module_platform_driver(xo1_rfkill_driver);
};
module_platform_driver(xo1_rfkill_driver);