Drivers: video: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
/*
|
||||
* Driver data
|
||||
*/
|
||||
static char *mode_option __devinitdata;
|
||||
static char *mode_option;
|
||||
|
||||
/*
|
||||
* If your driver supports multiple boards, you should make the
|
||||
@@ -84,7 +84,7 @@ struct xxx_par;
|
||||
* if we don't use modedb. If we do use modedb see xxxfb_init how to use it
|
||||
* to get a fb_var_screeninfo. Otherwise define a default var as well.
|
||||
*/
|
||||
static struct fb_fix_screeninfo xxxfb_fix __devinitdata = {
|
||||
static struct fb_fix_screeninfo xxxfb_fix = {
|
||||
.id = "FB's name",
|
||||
.type = FB_TYPE_PACKED_PIXELS,
|
||||
.visual = FB_VISUAL_PSEUDOCOLOR,
|
||||
@@ -678,8 +678,7 @@ static struct fb_ops xxxfb_ops = {
|
||||
*/
|
||||
|
||||
/* static int __init xxfb_probe (struct platform_device *pdev) -- for platform devs */
|
||||
static int __devinit xxxfb_probe(struct pci_dev *dev,
|
||||
const struct pci_device_id *ent)
|
||||
static int xxxfb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
|
||||
{
|
||||
struct fb_info *info;
|
||||
struct xxx_par *par;
|
||||
@@ -705,9 +704,7 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
|
||||
*/
|
||||
info->screen_base = framebuffer_virtual_memory;
|
||||
info->fbops = &xxxfb_ops;
|
||||
info->fix = xxxfb_fix; /* this will be the only time xxxfb_fix will be
|
||||
* used, so mark it as __devinitdata
|
||||
*/
|
||||
info->fix = xxxfb_fix;
|
||||
info->pseudo_palette = pseudo_palette; /* The pseudopalette is an
|
||||
* 16-member array
|
||||
*/
|
||||
@@ -836,8 +833,8 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
|
||||
/*
|
||||
* Cleanup
|
||||
*/
|
||||
/* static void __devexit xxxfb_remove(struct platform_device *pdev) */
|
||||
static void __devexit xxxfb_remove(struct pci_dev *dev)
|
||||
/* static void xxxfb_remove(struct platform_device *pdev) */
|
||||
static void xxxfb_remove(struct pci_dev *dev)
|
||||
{
|
||||
struct fb_info *info = pci_get_drvdata(dev);
|
||||
/* or platform_get_drvdata(pdev); */
|
||||
@@ -899,7 +896,7 @@ static struct pci_driver xxxfb_driver = {
|
||||
.name = "xxxfb",
|
||||
.id_table = xxxfb_id_table,
|
||||
.probe = xxxfb_probe,
|
||||
.remove = __devexit_p(xxxfb_remove),
|
||||
.remove = xxxfb_remove,
|
||||
.suspend = xxxfb_suspend, /* optional but recommended */
|
||||
.resume = xxxfb_resume, /* optional but recommended */
|
||||
};
|
||||
|
Reference in New Issue
Block a user