Commit 48c68c4f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8590dbc7

drivers/video/acornfb.c

+11 −11
Original line number Diff line number Diff line
@@ -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;

drivers/video/arcfb.c

+5 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct arcfb_par { 
	spinlock_t lock;

};



static struct fb_fix_screeninfo arcfb_fix __devinitdata = {

static struct fb_fix_screeninfo arcfb_fix = {

	.id =		"arcfb",

	.type =		FB_TYPE_PACKED_PIXELS,

	.visual =	FB_VISUAL_MONO01,
@@ -89,7 +89,7 @@ static struct fb_fix_screeninfo arcfb_fix __devinitdata = { 
	.accel =	FB_ACCEL_NONE,

};



static struct fb_var_screeninfo arcfb_var __devinitdata = {

static struct fb_var_screeninfo arcfb_var = {

	.xres		= 128,

	.yres		= 64,

	.xres_virtual	= 128,
@@ -502,7 +502,7 @@ static struct fb_ops arcfb_ops = { 
	.fb_ioctl 	= arcfb_ioctl,

};



static int __devinit arcfb_probe(struct platform_device *dev)

static int arcfb_probe(struct platform_device *dev)

{

	struct fb_info *info;

	int retval = -ENOMEM;
@@ -587,7 +587,7 @@ err: 
	return retval;

}



static int __devexit arcfb_remove(struct platform_device *dev)

static int arcfb_remove(struct platform_device *dev)

{

	struct fb_info *info = platform_get_drvdata(dev);
@@ -601,7 +601,7 @@ static int __devexit arcfb_remove(struct platform_device *dev) 


static struct platform_driver arcfb_driver = {

	.probe	= arcfb_probe,

	.remove = __devexit_p(arcfb_remove),

	.remove = arcfb_remove,

	.driver	= {

		.name	= "arcfb",

	},

drivers/video/arkfb.c

+5 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static const struct svga_timing_regs ark_timing_regs = { 


/* Module parameters */



static char *mode_option __devinitdata = "640x480-8@60";

static char *mode_option = "640x480-8@60";



#ifdef CONFIG_MTRR

static int mtrr = 1;
@@ -950,7 +950,7 @@ static struct fb_ops arkfb_ops = { 




/* PCI probe */

static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	struct pci_bus_region bus_reg;

	struct resource vga_res;
@@ -1086,7 +1086,7 @@ err_enable_device: 


/* PCI remove */



static void __devexit ark_pci_remove(struct pci_dev *dev)

static void ark_pci_remove(struct pci_dev *dev)

{

	struct fb_info *info = pci_get_drvdata(dev);
@@ -1184,7 +1184,7 @@ fail: 


/* List of boards that we are trying to support */



static struct pci_device_id ark_devices[] __devinitdata = {

static struct pci_device_id ark_devices[] = {

	{PCI_DEVICE(0xEDD8, 0xA099)},

	{0, 0, 0, 0, 0, 0, 0}

};
@@ -1196,7 +1196,7 @@ static struct pci_driver arkfb_pci_driver = { 
	.name		= "arkfb",

	.id_table	= ark_devices,

	.probe		= ark_pci_probe,

	.remove		= __devexit_p(ark_pci_remove),

	.remove		= ark_pci_remove,

	.suspend	= ark_pci_suspend,

	.resume		= ark_pci_resume,

};

drivers/video/asiliantfb.c

+9 −9
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static struct chips_init_reg chips_init_xr[] = 
	{0xd1, 0x01},

};



static void __devinit chips_hw_init(struct fb_info *p)

static void chips_hw_init(struct fb_info *p)

{

	int i;
@@ -474,7 +474,7 @@ static void __devinit chips_hw_init(struct fb_info *p) 
		write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);

}



static struct fb_fix_screeninfo asiliantfb_fix __devinitdata = {

static struct fb_fix_screeninfo asiliantfb_fix = {

	.id =		"Asiliant 69000",

	.type =		FB_TYPE_PACKED_PIXELS,

	.visual =	FB_VISUAL_PSEUDOCOLOR,
@@ -483,7 +483,7 @@ static struct fb_fix_screeninfo asiliantfb_fix __devinitdata = { 
	.smem_len =	0x200000,	/* 2MB */

};



static struct fb_var_screeninfo asiliantfb_var __devinitdata = {

static struct fb_var_screeninfo asiliantfb_var = {

	.xres 		= 640,

	.yres 		= 480,

	.xres_virtual 	= 640,
@@ -504,7 +504,7 @@ static struct fb_var_screeninfo asiliantfb_var __devinitdata = { 
	.vsync_len 	= 2,

};



static int __devinit init_asiliant(struct fb_info *p, unsigned long addr)

static int init_asiliant(struct fb_info *p, unsigned long addr)

{

	int err;
@@ -535,8 +535,8 @@ static int __devinit init_asiliant(struct fb_info *p, unsigned long addr) 
	return 0;

}



static int __devinit

asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)

static int asiliantfb_pci_init(struct pci_dev *dp,

			       const struct pci_device_id *ent)

{

	unsigned long addr, size;

	struct fb_info *p;
@@ -581,7 +581,7 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent) 
	return 0;

}



static void __devexit asiliantfb_remove(struct pci_dev *dp)

static void asiliantfb_remove(struct pci_dev *dp)

{

	struct fb_info *p = pci_get_drvdata(dp);
@@ -593,7 +593,7 @@ static void __devexit asiliantfb_remove(struct pci_dev *dp) 
	framebuffer_release(p);

}



static struct pci_device_id asiliantfb_pci_tbl[] __devinitdata = {

static struct pci_device_id asiliantfb_pci_tbl[] = {

	{ PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_69000, PCI_ANY_ID, PCI_ANY_ID },

	{ 0 }

};
@@ -604,7 +604,7 @@ static struct pci_driver asiliantfb_driver = { 
	.name =		"asiliantfb",

	.id_table =	asiliantfb_pci_tbl,

	.probe =	asiliantfb_pci_init,

	.remove =	__devexit_p(asiliantfb_remove),

	.remove =	asiliantfb_remove,

};



static int __init asiliantfb_init(void)

drivers/video/aty/aty128fb.c

+27 −30
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 


#ifndef CONFIG_PPC_PMAC

/* default mode */

static struct fb_var_screeninfo default_var __devinitdata = {

static struct fb_var_screeninfo default_var = {

	/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */

	640, 480, 640, 480, 0, 0, 8, 0,

	{0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0},
@@ -121,7 +121,7 @@ static struct fb_var_screeninfo default_var = { 


/* default modedb mode */

/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */

static struct fb_videomode defaultmode __devinitdata = {

static struct fb_videomode defaultmode = {

	.refresh =	60,

	.xres =		640,

	.yres =		480,
@@ -149,7 +149,7 @@ enum { 
};



/* Must match above enum */

static char * const r128_family[] __devinitconst = {

static char * const r128_family[] = {

	"AGP",

	"PCI",

	"PRO AGP",
@@ -275,7 +275,7 @@ static struct pci_driver aty128fb_driver = { 
	.name		= "aty128fb",

	.id_table	= aty128_pci_tbl,

	.probe		= aty128_probe,

	.remove		= __devexit_p(aty128_remove),

	.remove		= aty128_remove,

	.suspend	= aty128_pci_suspend,

	.resume		= aty128_pci_resume,

};
@@ -333,7 +333,7 @@ static const struct aty128_meminfo sdr_sgram = 
static const struct aty128_meminfo ddr_sgram =

	{ 4, 4, 3, 3, 2, 3, 1, 16, 31, 16, "64-bit DDR SGRAM" };



static struct fb_fix_screeninfo aty128fb_fix __devinitdata = {

static struct fb_fix_screeninfo aty128fb_fix = {

	.id		= "ATY Rage128",

	.type		= FB_TYPE_PACKED_PIXELS,

	.visual		= FB_VISUAL_PSEUDOCOLOR,
@@ -343,24 +343,24 @@ static struct fb_fix_screeninfo aty128fb_fix __devinitdata = { 
	.accel		= FB_ACCEL_ATI_RAGE128,

};



static char *mode_option __devinitdata = NULL;

static char *mode_option = NULL;



#ifdef CONFIG_PPC_PMAC

static int default_vmode __devinitdata = VMODE_1024_768_60;

static int default_cmode __devinitdata = CMODE_8;

static int default_vmode = VMODE_1024_768_60;

static int default_cmode = CMODE_8;

#endif



static int default_crt_on __devinitdata = 0;

static int default_lcd_on __devinitdata = 1;

static int default_crt_on = 0;

static int default_lcd_on = 1;



#ifdef CONFIG_MTRR

static bool mtrr = true;

#endif



#ifdef CONFIG_PMAC_BACKLIGHT

static int backlight __devinitdata = 1;

static int backlight = 1;

#else

static int backlight __devinitdata = 0;

static int backlight = 0;

#endif



/* PLL constants */
@@ -449,9 +449,8 @@ static int aty128_encode_var(struct fb_var_screeninfo *var, 
static int aty128_decode_var(struct fb_var_screeninfo *var,

                             struct aty128fb_par *par);

#if 0

static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,

					 void __iomem *bios);

static void __devinit __iomem *aty128_map_ROM(struct pci_dev *pdev,

static void aty128_get_pllinfo(struct aty128fb_par *par, void __iomem *bios);

static void __iomem *aty128_map_ROM(struct pci_dev *pdev,

				    const struct aty128fb_par *par);

#endif

static void aty128_timings(struct aty128fb_par *par);
@@ -582,7 +581,7 @@ static void aty_pll_writeupdate(const struct aty128fb_par *par) 




/* write to the scratch register to test r/w functionality */

static int __devinit register_test(const struct aty128fb_par *par)

static int register_test(const struct aty128fb_par *par)

{

	u32 val;

	int flag = 0;
@@ -781,7 +780,7 @@ static u32 depth_to_dst(u32 depth) 




#ifndef __sparc__

static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par,

static void __iomem *aty128_map_ROM(const struct aty128fb_par *par,

				    struct pci_dev *dev)

{

	u16 dptr;
@@ -868,7 +867,7 @@ static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, 
	return NULL;

}



static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,

static void aty128_get_pllinfo(struct aty128fb_par *par,

			       unsigned char __iomem *bios)

{

	unsigned int bios_hdr;
@@ -891,7 +890,7 @@ static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, 
}           



#ifdef CONFIG_X86

static void __iomem *  __devinit aty128_find_mem_vbios(struct aty128fb_par *par)

static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par)

{

	/* I simplified this code as we used to miss the signatures in

	 * a lot of case. It's now closer to XFree, we just don't check
@@ -916,7 +915,7 @@ static void __iomem * __devinit aty128_find_mem_vbios(struct aty128fb_par *par) 
#endif /* ndef(__sparc__) */



/* fill in known card constants if pll_block is not available */

static void __devinit aty128_timings(struct aty128fb_par *par)

static void aty128_timings(struct aty128fb_par *par)

{

#ifdef CONFIG_PPC_OF

	/* instead of a table lookup, assume OF has properly
@@ -1658,7 +1657,7 @@ static int aty128fb_sync(struct fb_info *info) 
}



#ifndef MODULE

static int __devinit aty128fb_setup(char *options)

static int aty128fb_setup(char *options)

{

	char *this_opt;
@@ -1888,8 +1887,7 @@ static void aty128_early_resume(void *data) 
}

#endif /* CONFIG_PPC_PMAC */



static int __devinit aty128_init(struct pci_dev *pdev,

				 const struct pci_device_id *ent)

static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct fb_info *info = pci_get_drvdata(pdev);

	struct aty128fb_par *par = info->par;
@@ -2039,8 +2037,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, 


#ifdef CONFIG_PCI

/* register a card    ++ajoshi */

static int __devinit aty128_probe(struct pci_dev *pdev,

				  const struct pci_device_id *ent)

static int aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	unsigned long fb_addr, reg_addr;

	struct aty128fb_par *par;
@@ -2156,7 +2153,7 @@ err_free_fb: 
	return -ENODEV;

}



static void __devexit aty128_remove(struct pci_dev *pdev)

static void aty128_remove(struct pci_dev *pdev)

{

	struct fb_info *info = pci_get_drvdata(pdev);

	struct aty128fb_par *par;
@@ -2558,7 +2555,7 @@ static int aty128_pci_resume(struct pci_dev *pdev) 
}





static int __devinit aty128fb_init(void)

static int aty128fb_init(void)

{

#ifndef MODULE

	char *option = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE