korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 22:11:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] vfb: Update platform code

Browse Source 
Update platform code to dynamically allocate the platform device

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Antonino A. Daplas 2006-06-26 00:26:34 -07:00 committed by Linus Torvalds
parent 103edf024b
commit 20cecf6a6a
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/video/vfb.c
View File

@ -398,12 +398,6 @@ static int __init vfb_setup(char *options)
* Initialisation
*/
static void vfb_platform_release(struct device *device)
{
// This is called when the reference count goes to zero.
dev_err(device, "This driver is broken, please bug the authors so they will fix it.\n");
}
static int __init vfb_probe(struct platform_device *dev)
{
struct fb_info *info;
@ -482,13 +476,7 @@ static struct platform_driver vfb_driver = {
},
};
static struct platform_device vfb_device = {
.name = "vfb",
.id = 0,
.dev = {
.release = vfb_platform_release,
}
};
static struct platform_device *vfb_device;
static int __init vfb_init(void)
{
@ -508,10 +496,19 @@ static int __init vfb_init(void)
ret = platform_driver_register(&vfb_driver);
if (!ret) {
ret = platform_device_register(&vfb_device);
if (ret)
vfb_device = platform_device_alloc("vfb", 0);
if (vfb_device)
ret = platform_device_add(vfb_device);
else
ret = -ENOMEM;
if (ret) {
platform_device_put(vfb_device);
platform_driver_unregister(&vfb_driver);
}
}
return ret;
}
@ -520,7 +517,7 @@ module_init(vfb_init);
#ifdef MODULE
static void __exit vfb_exit(void)
{
platform_device_unregister(&vfb_device);
platform_device_unregister(vfb_device);
platform_driver_unregister(&vfb_driver);
}