projects
/
platform
/
kernel
/
linux-arm64.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[platform/kernel/linux-arm64.git]
/
drivers
/
video
/
wmt_ge_rops.c
diff --git
a/drivers/video/wmt_ge_rops.c
b/drivers/video/wmt_ge_rops.c
index
ba025b4
..
4aaeb18
100644
(file)
--- a/
drivers/video/wmt_ge_rops.c
+++ b/
drivers/video/wmt_ge_rops.c
@@
-124,7
+124,7
@@
int wmt_ge_sync(struct fb_info *p)
}
EXPORT_SYMBOL_GPL(wmt_ge_sync);
}
EXPORT_SYMBOL_GPL(wmt_ge_sync);
-static int
__devinit
wmt_ge_rops_probe(struct platform_device *pdev)
+static int wmt_ge_rops_probe(struct platform_device *pdev)
{
struct resource *res;
{
struct resource *res;
@@
-152,7
+152,7
@@
static int __devinit wmt_ge_rops_probe(struct platform_device *pdev)
return 0;
}
return 0;
}
-static int
__devexit
wmt_ge_rops_remove(struct platform_device *pdev)
+static int wmt_ge_rops_remove(struct platform_device *pdev)
{
iounmap(regbase);
return 0;
{
iounmap(regbase);
return 0;
@@
-165,7
+165,7
@@
static const struct of_device_id wmt_dt_ids[] = {
static struct platform_driver wmt_ge_rops_driver = {
.probe = wmt_ge_rops_probe,
static struct platform_driver wmt_ge_rops_driver = {
.probe = wmt_ge_rops_probe,
- .remove =
__devexit_p(wmt_ge_rops_remove)
,
+ .remove =
wmt_ge_rops_remove
,
.driver = {
.owner = THIS_MODULE,
.name = "wmt_ge_rops",
.driver = {
.owner = THIS_MODULE,
.name = "wmt_ge_rops",