diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:07:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:01 -0500 |
commit | 48c68c4f1b542444f175a9e136febcecf3e704d8 (patch) | |
tree | d28f4f3b42643990c2908d27e9caf120f6234b73 /drivers/video/vga16fb.c | |
parent | 8590dbc79a0ff5d7ab16b2b1743684c241ae3c65 (diff) |
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>
Diffstat (limited to 'drivers/video/vga16fb.c')
-rw-r--r-- | drivers/video/vga16fb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c index 0267acd8dc83..545faeccdb44 100644 --- a/drivers/video/vga16fb.c +++ b/drivers/video/vga16fb.c | |||
@@ -65,7 +65,7 @@ struct vga16fb_par { | |||
65 | 65 | ||
66 | /* --------------------------------------------------------------------- */ | 66 | /* --------------------------------------------------------------------- */ |
67 | 67 | ||
68 | static struct fb_var_screeninfo vga16fb_defined __devinitdata = { | 68 | static struct fb_var_screeninfo vga16fb_defined = { |
69 | .xres = 640, | 69 | .xres = 640, |
70 | .yres = 480, | 70 | .yres = 480, |
71 | .xres_virtual = 640, | 71 | .xres_virtual = 640, |
@@ -85,7 +85,7 @@ static struct fb_var_screeninfo vga16fb_defined __devinitdata = { | |||
85 | }; | 85 | }; |
86 | 86 | ||
87 | /* name should not depend on EGA/VGA */ | 87 | /* name should not depend on EGA/VGA */ |
88 | static struct fb_fix_screeninfo vga16fb_fix __devinitdata = { | 88 | static struct fb_fix_screeninfo vga16fb_fix = { |
89 | .id = "VGA16 VGA", | 89 | .id = "VGA16 VGA", |
90 | .smem_start = VGA_FB_PHYS, | 90 | .smem_start = VGA_FB_PHYS, |
91 | .smem_len = VGA_FB_PHYS_LEN, | 91 | .smem_len = VGA_FB_PHYS_LEN, |
@@ -1303,7 +1303,7 @@ static int __init vga16fb_setup(char *options) | |||
1303 | } | 1303 | } |
1304 | #endif | 1304 | #endif |
1305 | 1305 | ||
1306 | static int __devinit vga16fb_probe(struct platform_device *dev) | 1306 | static int vga16fb_probe(struct platform_device *dev) |
1307 | { | 1307 | { |
1308 | struct fb_info *info; | 1308 | struct fb_info *info; |
1309 | struct vga16fb_par *par; | 1309 | struct vga16fb_par *par; |
@@ -1395,7 +1395,7 @@ static int __devinit vga16fb_probe(struct platform_device *dev) | |||
1395 | return ret; | 1395 | return ret; |
1396 | } | 1396 | } |
1397 | 1397 | ||
1398 | static int __devexit vga16fb_remove(struct platform_device *dev) | 1398 | static int vga16fb_remove(struct platform_device *dev) |
1399 | { | 1399 | { |
1400 | struct fb_info *info = platform_get_drvdata(dev); | 1400 | struct fb_info *info = platform_get_drvdata(dev); |
1401 | 1401 | ||
@@ -1407,7 +1407,7 @@ static int __devexit vga16fb_remove(struct platform_device *dev) | |||
1407 | 1407 | ||
1408 | static struct platform_driver vga16fb_driver = { | 1408 | static struct platform_driver vga16fb_driver = { |
1409 | .probe = vga16fb_probe, | 1409 | .probe = vga16fb_probe, |
1410 | .remove = __devexit_p(vga16fb_remove), | 1410 | .remove = vga16fb_remove, |
1411 | .driver = { | 1411 | .driver = { |
1412 | .name = "vga16fb", | 1412 | .name = "vga16fb", |
1413 | }, | 1413 | }, |