Skip to content

Commit

Permalink
Drivers: video: remove __dev* attributes.
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@gregkh
gregkh committed Jan 3, 2013
1 parent 8590dbc commit 48c68c4
Show file tree
Hide file tree
Showing 135 changed files with 1,017 additions and 1,129 deletions.
22 changes: 11 additions & 11 deletions drivers/video/acornfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -1065,7 +1065,7 @@ static void __devinit acornfb_parse_mon(char *opt)
current_par.montype = -1;
}

static void __devinit acornfb_parse_montype(char *opt)
static void acornfb_parse_montype(char *opt)
{
current_par.montype = -2;

Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions drivers/video/arcfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -587,7 +587,7 @@ static int __devinit arcfb_probe(struct platform_device *dev)
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);

Expand All @@ -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",
},
Expand Down
10 changes: 5 additions & 5 deletions drivers/video/arkfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1086,7 +1086,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_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);

Expand Down Expand Up @@ -1184,7 +1184,7 @@ static int ark_pci_resume (struct pci_dev* dev)

/* 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}
};
Expand All @@ -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,
};
Expand Down
18 changes: 9 additions & 9 deletions drivers/video/asiliantfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand All @@ -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 }
};
Expand All @@ -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)
Expand Down
Loading

0 comments on commit 48c68c4

Please sign in to comment.