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:
@@ -66,7 +66,7 @@
|
||||
* have. Allow 1% either way on the nominal for TVs.
|
||||
*/
|
||||
#define NR_MONTYPES 6
|
||||
static struct fb_monspecs monspecs[NR_MONTYPES] __devinitdata = {
|
||||
static struct fb_monspecs monspecs[NR_MONTYPES] = {
|
||||
{ /* TV */
|
||||
.hfmin = 15469,
|
||||
.hfmax = 15781,
|
||||
@@ -874,7 +874,7 @@ static struct fb_ops acornfb_ops = {
|
||||
/*
|
||||
* Everything after here is initialisation!!!
|
||||
*/
|
||||
static struct fb_videomode modedb[] __devinitdata = {
|
||||
static struct fb_videomode modedb[] = {
|
||||
{ /* 320x256 @ 50Hz */
|
||||
NULL, 50, 320, 256, 125000, 92, 62, 35, 19, 38, 2,
|
||||
FB_SYNC_COMP_HIGH_ACT,
|
||||
@@ -926,7 +926,7 @@ static struct fb_videomode modedb[] __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct fb_videomode acornfb_default_mode __devinitdata = {
|
||||
static struct fb_videomode acornfb_default_mode = {
|
||||
.name = NULL,
|
||||
.refresh = 60,
|
||||
.xres = 640,
|
||||
@@ -942,7 +942,7 @@ static struct fb_videomode acornfb_default_mode __devinitdata = {
|
||||
.vmode = FB_VMODE_NONINTERLACED
|
||||
};
|
||||
|
||||
static void __devinit acornfb_init_fbinfo(void)
|
||||
static void acornfb_init_fbinfo(void)
|
||||
{
|
||||
static int first = 1;
|
||||
|
||||
@@ -1018,7 +1018,7 @@ static void __devinit acornfb_init_fbinfo(void)
|
||||
* size can optionally be followed by 'M' or 'K' for
|
||||
* MB or KB respectively.
|
||||
*/
|
||||
static void __devinit acornfb_parse_mon(char *opt)
|
||||
static void acornfb_parse_mon(char *opt)
|
||||
{
|
||||
char *p = opt;
|
||||
|
||||
@@ -1065,7 +1065,7 @@ bad:
|
||||
current_par.montype = -1;
|
||||
}
|
||||
|
||||
static void __devinit acornfb_parse_montype(char *opt)
|
||||
static void acornfb_parse_montype(char *opt)
|
||||
{
|
||||
current_par.montype = -2;
|
||||
|
||||
@@ -1106,7 +1106,7 @@ static void __devinit acornfb_parse_montype(char *opt)
|
||||
}
|
||||
}
|
||||
|
||||
static void __devinit acornfb_parse_dram(char *opt)
|
||||
static void acornfb_parse_dram(char *opt)
|
||||
{
|
||||
unsigned int size;
|
||||
|
||||
@@ -1131,14 +1131,14 @@ static void __devinit acornfb_parse_dram(char *opt)
|
||||
static struct options {
|
||||
char *name;
|
||||
void (*parse)(char *opt);
|
||||
} opt_table[] __devinitdata = {
|
||||
} opt_table[] = {
|
||||
{ "mon", acornfb_parse_mon },
|
||||
{ "montype", acornfb_parse_montype },
|
||||
{ "dram", acornfb_parse_dram },
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
||||
static int __devinit acornfb_setup(char *options)
|
||||
static int acornfb_setup(char *options)
|
||||
{
|
||||
struct options *optp;
|
||||
char *opt;
|
||||
@@ -1175,7 +1175,7 @@ static int __devinit acornfb_setup(char *options)
|
||||
* Detect type of monitor connected
|
||||
* For now, we just assume SVGA
|
||||
*/
|
||||
static int __devinit acornfb_detect_monitortype(void)
|
||||
static int acornfb_detect_monitortype(void)
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
@@ -1216,7 +1216,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
|
||||
printk("acornfb: freed %dK memory\n", mb_freed);
|
||||
}
|
||||
|
||||
static int __devinit acornfb_probe(struct platform_device *dev)
|
||||
static int acornfb_probe(struct platform_device *dev)
|
||||
{
|
||||
unsigned long size;
|
||||
u_int h_sync, v_sync;
|
||||
|
Reference in New Issue
Block a user