git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
video
/
epson1355fb.c
diff --git
a/drivers/video/epson1355fb.c
b/drivers/video/epson1355fb.c
index
3b0e713
..
f0a621e
100644
(file)
--- a/
drivers/video/epson1355fb.c
+++ b/
drivers/video/epson1355fb.c
@@
-605,10
+605,6
@@
static void clearfb16(struct fb_info *info)
fb_writeb(0, dst);
}
fb_writeb(0, dst);
}
-static void epson1355fb_platform_release(struct device *device)
-{
-}
-
static int epson1355fb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
static int epson1355fb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
@@
-732,13
+728,7
@@
static struct platform_driver epson1355fb_driver = {
},
};
},
};
-static struct platform_device epson1355fb_device = {
- .name = "epson1355fb",
- .id = 0,
- .dev = {
- .release = epson1355fb_platform_release,
- }
-};
+static struct platform_device *epson1355fb_device;
int __init epson1355fb_init(void)
{
int __init epson1355fb_init(void)
{
@@
-748,11
+738,21
@@
int __init epson1355fb_init(void)
return -ENODEV;
ret = platform_driver_register(&epson1355fb_driver);
return -ENODEV;
ret = platform_driver_register(&epson1355fb_driver);
+
if (!ret) {
if (!ret) {
- ret = platform_device_register(&epson1355fb_device);
- if (ret)
+ epson1355fb_device = platform_device_alloc("epson1355fb", 0);
+
+ if (epson1355fb_device)
+ ret = platform_device_add(epson1355fb_device);
+ else
+ ret = -ENOMEM;
+
+ if (ret) {
+ platform_device_put(epson1355fb_device);
platform_driver_unregister(&epson1355fb_driver);
platform_driver_unregister(&epson1355fb_driver);
+ }
}
}
+
return ret;
}
return ret;
}
@@
-761,7
+761,7
@@
module_init(epson1355fb_init);
#ifdef MODULE
static void __exit epson1355fb_exit(void)
{
#ifdef MODULE
static void __exit epson1355fb_exit(void)
{
- platform_device_unregister(
&
epson1355fb_device);
+ platform_device_unregister(epson1355fb_device);
platform_driver_unregister(&epson1355fb_driver);
}
platform_driver_unregister(&epson1355fb_driver);
}