fbdev: vesafb: bind to platform-framebuffer device
x86 creates platform-framebuffer platform devices for every system framebuffer. Use these instead of creating a dummy device. This requires us to remove the __init annotations as hotplugging may occur during runtime. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Link: http://lkml.kernel.org/r/1375445127-15480-7-git-send-email-dh.herrmann@gmail.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
parent
9a6a36d19c
commit
2e5155ecbb
|
@ -29,7 +29,7 @@
|
|||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
static struct fb_var_screeninfo vesafb_defined __initdata = {
|
||||
static struct fb_var_screeninfo vesafb_defined = {
|
||||
.activate = FB_ACTIVATE_NOW,
|
||||
.height = -1,
|
||||
.width = -1,
|
||||
|
@ -40,7 +40,7 @@ static struct fb_var_screeninfo vesafb_defined __initdata = {
|
|||
.vmode = FB_VMODE_NONINTERLACED,
|
||||
};
|
||||
|
||||
static struct fb_fix_screeninfo vesafb_fix __initdata = {
|
||||
static struct fb_fix_screeninfo vesafb_fix = {
|
||||
.id = "VESA VGA",
|
||||
.type = FB_TYPE_PACKED_PIXELS,
|
||||
.accel = FB_ACCEL_NONE,
|
||||
|
@ -48,8 +48,8 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
|
|||
|
||||
static int inverse __read_mostly;
|
||||
static int mtrr __read_mostly; /* disable mtrr */
|
||||
static int vram_remap __initdata; /* Set amount of memory to be used */
|
||||
static int vram_total __initdata; /* Set total amount of memory */
|
||||
static int vram_remap; /* Set amount of memory to be used */
|
||||
static int vram_total; /* Set total amount of memory */
|
||||
static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
|
||||
static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
|
||||
static void (*pmi_start)(void) __read_mostly;
|
||||
|
@ -192,7 +192,7 @@ static struct fb_ops vesafb_ops = {
|
|||
.fb_imageblit = cfb_imageblit,
|
||||
};
|
||||
|
||||
static int __init vesafb_setup(char *options)
|
||||
static int vesafb_setup(char *options)
|
||||
{
|
||||
char *this_opt;
|
||||
|
||||
|
@ -226,13 +226,18 @@ static int __init vesafb_setup(char *options)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __init vesafb_probe(struct platform_device *dev)
|
||||
static int vesafb_probe(struct platform_device *dev)
|
||||
{
|
||||
struct fb_info *info;
|
||||
int i, err;
|
||||
unsigned int size_vmode;
|
||||
unsigned int size_remap;
|
||||
unsigned int size_total;
|
||||
char *option = NULL;
|
||||
|
||||
/* ignore error return of fb_get_options */
|
||||
fb_get_options("vesafb", &option);
|
||||
vesafb_setup(option);
|
||||
|
||||
if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
|
||||
return -ENODEV;
|
||||
|
@ -496,40 +501,12 @@ err:
|
|||
}
|
||||
|
||||
static struct platform_driver vesafb_driver = {
|
||||
.driver = {
|
||||
.name = "vesafb",
|
||||
.driver = {
|
||||
.name = "vesa-framebuffer",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = vesafb_probe,
|
||||
};
|
||||
|
||||
static struct platform_device *vesafb_device;
|
||||
|
||||
static int __init vesafb_init(void)
|
||||
{
|
||||
int ret;
|
||||
char *option = NULL;
|
||||
|
||||
/* ignore error return of fb_get_options */
|
||||
fb_get_options("vesafb", &option);
|
||||
vesafb_setup(option);
|
||||
|
||||
vesafb_device = platform_device_alloc("vesafb", 0);
|
||||
if (!vesafb_device)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = platform_device_add(vesafb_device);
|
||||
if (!ret) {
|
||||
ret = platform_driver_probe(&vesafb_driver, vesafb_probe);
|
||||
if (ret)
|
||||
platform_device_del(vesafb_device);
|
||||
}
|
||||
|
||||
if (ret) {
|
||||
platform_device_put(vesafb_device);
|
||||
vesafb_device = NULL;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
module_init(vesafb_init);
|
||||
|
||||
module_platform_driver(vesafb_driver);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
Loading…
Reference in a new issue