projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] EDD isn't EXPERIMENTAL anymore
[powerpc.git]
/
drivers
/
video
/
dnfb.c
diff --git
a/drivers/video/dnfb.c
b/drivers/video/dnfb.c
index
957a3ad
..
5abd3cb
100644
(file)
--- a/
drivers/video/dnfb.c
+++ b/
drivers/video/dnfb.c
@@
-227,9
+227,8
@@
void dnfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
* Initialization
*/
* Initialization
*/
-static int __devinit dnfb_probe(struct
device *device
)
+static int __devinit dnfb_probe(struct
platform_device *dev
)
{
{
- struct platform_device *dev = to_platform_device(device);
struct fb_info *info;
int err = 0;
struct fb_info *info;
int err = 0;
@@
-257,7
+256,7
@@
static int __devinit dnfb_probe(struct device *device)
framebuffer_release(info);
return err;
}
framebuffer_release(info);
return err;
}
-
dev_set_drvdata(&dev->
dev, info);
+
platform_set_drvdata(
dev, info);
/* now we have registered we can safely setup the hardware */
out_8(AP_CONTROL_3A, RESET_CREG);
/* now we have registered we can safely setup the hardware */
out_8(AP_CONTROL_3A, RESET_CREG);
@@
-271,10
+270,11
@@
static int __devinit dnfb_probe(struct device *device)
return err;
}
return err;
}
-static struct device_driver dnfb_driver = {
- .name = "dnfb",
- .bus = &platform_bus_type,
+static struct platform_driver dnfb_driver = {
.probe = dnfb_probe,
.probe = dnfb_probe,
+ .driver = {
+ .name = "dnfb",
+ },
};
static struct platform_device dnfb_device = {
};
static struct platform_device dnfb_device = {
@@
-288,12
+288,12
@@
int __init dnfb_init(void)
if (fb_get_options("dnfb", NULL))
return -ENODEV;
if (fb_get_options("dnfb", NULL))
return -ENODEV;
- ret = driver_register(&dnfb_driver);
+ ret =
platform_
driver_register(&dnfb_driver);
if (!ret) {
ret = platform_device_register(&dnfb_device);
if (ret)
if (!ret) {
ret = platform_device_register(&dnfb_device);
if (ret)
- driver_unregister(&dnfb_driver);
+
platform_
driver_unregister(&dnfb_driver);
}
return ret;
}
}
return ret;
}