mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
gx1fb: Fix section mismatch warnings
Fix a chain of section mismatches in geode driver, beginning with: WARNING: drivers/video/geode/gx1fb.o(.data+0x70): Section mismatch in reference from the variable gx1fb_driver to the function .init.text:gx1fb_probe() The variable gx1fb_driver references the function __init gx1fb_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console Making the changes that Paul pointed out resulted in a few more changes being needed, so they are all included here. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
bccaeafd7c
commit
3535ed3fa7
@ -29,7 +29,7 @@ static int crt_option = 1;
|
||||
static char panel_option[32] = "";
|
||||
|
||||
/* Modes relevant to the GX1 (taken from modedb.c) */
|
||||
static const struct fb_videomode __initdata gx1_modedb[] = {
|
||||
static const struct fb_videomode __devinitdata gx1_modedb[] = {
|
||||
/* 640x480-60 VESA */
|
||||
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
|
||||
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
|
||||
@ -195,7 +195,7 @@ static int gx1fb_blank(int blank_mode, struct fb_info *info)
|
||||
return par->vid_ops->blank_display(info, blank_mode);
|
||||
}
|
||||
|
||||
static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
|
||||
static int __devinit gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
|
||||
{
|
||||
struct geodefb_par *par = info->par;
|
||||
unsigned gx_base;
|
||||
@ -268,7 +268,7 @@ static struct fb_ops gx1fb_ops = {
|
||||
.fb_imageblit = cfb_imageblit,
|
||||
};
|
||||
|
||||
static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)
|
||||
static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev)
|
||||
{
|
||||
struct geodefb_par *par;
|
||||
struct fb_info *info;
|
||||
@ -318,7 +318,7 @@ static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)
|
||||
return info;
|
||||
}
|
||||
|
||||
static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
{
|
||||
struct geodefb_par *par;
|
||||
struct fb_info *info;
|
||||
@ -382,7 +382,7 @@ static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void gx1fb_remove(struct pci_dev *pdev)
|
||||
static void __devexit gx1fb_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct fb_info *info = pci_get_drvdata(pdev);
|
||||
struct geodefb_par *par = info->par;
|
||||
@ -441,7 +441,7 @@ static struct pci_driver gx1fb_driver = {
|
||||
.name = "gx1fb",
|
||||
.id_table = gx1fb_id_table,
|
||||
.probe = gx1fb_probe,
|
||||
.remove = gx1fb_remove,
|
||||
.remove = __devexit_p(gx1fb_remove),
|
||||
};
|
||||
|
||||
static int __init gx1fb_init(void)
|
||||
@ -456,7 +456,7 @@ static int __init gx1fb_init(void)
|
||||
return pci_register_driver(&gx1fb_driver);
|
||||
}
|
||||
|
||||
static void __exit gx1fb_cleanup(void)
|
||||
static void __devexit gx1fb_cleanup(void)
|
||||
{
|
||||
pci_unregister_driver(&gx1fb_driver);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user