git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
video
/
epson1355fb.c
diff --git
a/drivers/video/epson1355fb.c
b/drivers/video/epson1355fb.c
index
116e808
..
0827594
100644
(file)
--- a/
drivers/video/epson1355fb.c
+++ b/
drivers/video/epson1355fb.c
@@
-54,6
+54,8
@@
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/ioport.h>
+#include <linux/platform_device.h>
+
#include <asm/types.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/types.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@
-482,7
+484,6
@@
static struct fb_ops epson1355fb_fbops = {
.fb_imageblit = cfb_imageblit,
.fb_read = epson1355fb_read,
.fb_write = epson1355fb_write,
.fb_imageblit = cfb_imageblit,
.fb_read = epson1355fb_read,
.fb_write = epson1355fb_write,
- .fb_cursor = soft_cursor,
};
/* ------------------------------------------------------------------------- */
};
/* ------------------------------------------------------------------------- */
@@
-606,11
+607,12
@@
static void clearfb16(struct fb_info *info)
static void epson1355fb_platform_release(struct device *device)
{
static void epson1355fb_platform_release(struct device *device)
{
+ dev_err(device, "This driver is broken, please bug the authors so they will fix it.\n");
}
}
-static int epson1355fb_remove(struct
device *device
)
+static int epson1355fb_remove(struct
platform_device *dev
)
{
{
- struct fb_info *info =
dev_get_drvdata(device
);
+ struct fb_info *info =
platform_get_drvdata(dev
);
struct epson1355_par *par = info->par;
backlight_enable(0);
struct epson1355_par *par = info->par;
backlight_enable(0);
@@
-631,9
+633,8
@@
static int epson1355fb_remove(struct device *device)
return 0;
}
return 0;
}
-int __init epson1355fb_probe(struct
device *device
)
+int __init epson1355fb_probe(struct
platform_device *dev
)
{
{
- struct platform_device *dev = to_platform_device(device);
struct epson1355_par *default_par;
struct fb_info *info;
u8 revision;
struct epson1355_par *default_par;
struct fb_info *info;
u8 revision;
@@
-712,7
+713,7
@@
int __init epson1355fb_probe(struct device *device)
/*
* Our driver data.
*/
/*
* Our driver data.
*/
-
dev_set_drvdata(&dev->
dev, info);
+
platform_set_drvdata(
dev, info);
printk(KERN_INFO "fb%d: %s frame buffer device\n",
info->node, info->fix.id);
printk(KERN_INFO "fb%d: %s frame buffer device\n",
info->node, info->fix.id);
@@
-720,15
+721,16
@@
int __init epson1355fb_probe(struct device *device)
return 0;
bail:
return 0;
bail:
- epson1355fb_remove(dev
ice
);
+ epson1355fb_remove(dev);
return rc;
}
return rc;
}
-static struct device_driver epson1355fb_driver = {
- .name = "epson1355fb",
- .bus = &platform_bus_type,
+static struct platform_driver epson1355fb_driver = {
.probe = epson1355fb_probe,
.remove = epson1355fb_remove,
.probe = epson1355fb_probe,
.remove = epson1355fb_remove,
+ .driver = {
+ .name = "epson1355fb",
+ },
};
static struct platform_device epson1355fb_device = {
};
static struct platform_device epson1355fb_device = {
@@
-746,11
+748,11
@@
int __init epson1355fb_init(void)
if (fb_get_options("epson1355fb", NULL))
return -ENODEV;
if (fb_get_options("epson1355fb", NULL))
return -ENODEV;
- ret = driver_register(&epson1355fb_driver);
+ ret =
platform_
driver_register(&epson1355fb_driver);
if (!ret) {
ret = platform_device_register(&epson1355fb_device);
if (ret)
if (!ret) {
ret = platform_device_register(&epson1355fb_device);
if (ret)
- driver_unregister(&epson1355fb_driver);
+
platform_
driver_unregister(&epson1355fb_driver);
}
return ret;
}
}
return ret;
}
@@
-761,7
+763,7
@@
module_init(epson1355fb_init);
static void __exit epson1355fb_exit(void)
{
platform_device_unregister(&epson1355fb_device);
static void __exit epson1355fb_exit(void)
{
platform_device_unregister(&epson1355fb_device);
- driver_unregister(&epson1355fb_driver);
+
platform_
driver_unregister(&epson1355fb_driver);
}
/* ------------------------------------------------------------------------- */
}
/* ------------------------------------------------------------------------- */