#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
+#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <linux/screen_info.h>
#include <asm/io.h>
#include <video/vga.h>
}
#endif
-static int __init vga16fb_probe(struct platform_device *dev)
+static int __init vga16fb_probe(struct device *device)
{
+ struct platform_device *dev = to_platform_device(device);
struct fb_info *info;
struct vga16fb_par *par;
int i;
}
/* XXX share VGA_FB_PHYS and I/O region with vgacon and others */
- info->screen_base = (void __iomem *)VGA_MAP_MEM(VGA_FB_PHYS, 0);
+ info->screen_base = (void __iomem *)VGA_MAP_MEM(VGA_FB_PHYS);
if (!info->screen_base) {
printk(KERN_ERR "vga16fb: unable to map device\n");
printk(KERN_INFO "fb%d: %s frame buffer device\n",
info->node, info->fix.id);
- platform_set_drvdata(dev, info);
+ dev_set_drvdata(device, info);
return 0;
return ret;
}
-static int vga16fb_remove(struct platform_device *dev)
+static int vga16fb_remove(struct device *device)
{
- struct fb_info *info = platform_get_drvdata(dev);
+ struct fb_info *info = dev_get_drvdata(device);
if (info) {
unregister_framebuffer(info);
return 0;
}
-static struct platform_driver vga16fb_driver = {
+static struct device_driver vga16fb_driver = {
+ .name = "vga16fb",
+ .bus = &platform_bus_type,
.probe = vga16fb_probe,
.remove = vga16fb_remove,
- .driver = {
- .name = "vga16fb",
- },
};
-static struct platform_device *vga16fb_device;
+static struct platform_device vga16fb_device = {
+ .name = "vga16fb",
+};
static int __init vga16fb_init(void)
{
vga16fb_setup(option);
#endif
- ret = platform_driver_register(&vga16fb_driver);
+ ret = driver_register(&vga16fb_driver);
if (!ret) {
- vga16fb_device = platform_device_alloc("vga16fb", 0);
-
- if (vga16fb_device)
- ret = platform_device_add(vga16fb_device);
- else
- ret = -ENOMEM;
-
- if (ret) {
- platform_device_put(vga16fb_device);
- platform_driver_unregister(&vga16fb_driver);
- }
+ ret = platform_device_register(&vga16fb_device);
+ if (ret)
+ driver_unregister(&vga16fb_driver);
}
return ret;
static void __exit vga16fb_exit(void)
{
- platform_device_unregister(vga16fb_device);
- platform_driver_unregister(&vga16fb_driver);
+ platform_device_unregister(&vga16fb_device);
+ driver_unregister(&vga16fb_driver);
}
MODULE_LICENSE("GPL");