aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/pvr2fb.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-06 15:05:06 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-07-06 15:05:06 -0400
commit7e7ec0d4ae57b258fed5ee29e9d007282898625a (patch)
tree12a1ec48e103fafd5a8eaf8d79008e8bdf9df8e2 /drivers/video/pvr2fb.c
parente9705a77f50c1fd52356f4f0e515455273aae416 (diff)
fb: pvr2fb: A few more __devinit annotations for PCI.
In the PCI + hotplug case we end up with some bogus references between the PCI driver path and the DC path. In order to fix this, we have to rework the common init path for __devinit, as well as moving all of the data that it references to __devinidata. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/pvr2fb.c')
-rw-r--r--drivers/video/pvr2fb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 1b06ff5aafdf..2ba959a83eb0 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -115,11 +115,11 @@ enum { VO_PAL, VO_NTSC, VO_VGA };
115enum { PAL_ARGB1555, PAL_RGB565, PAL_ARGB4444, PAL_ARGB8888 }; 115enum { PAL_ARGB1555, PAL_RGB565, PAL_ARGB4444, PAL_ARGB8888 };
116 116
117struct pvr2_params { unsigned int val; char *name; }; 117struct pvr2_params { unsigned int val; char *name; };
118static struct pvr2_params cables[] __initdata = { 118static struct pvr2_params cables[] __devinitdata = {
119 { CT_VGA, "VGA" }, { CT_RGB, "RGB" }, { CT_COMPOSITE, "COMPOSITE" }, 119 { CT_VGA, "VGA" }, { CT_RGB, "RGB" }, { CT_COMPOSITE, "COMPOSITE" },
120}; 120};
121 121
122static struct pvr2_params outputs[] __initdata = { 122static struct pvr2_params outputs[] __devinitdata = {
123 { VO_PAL, "PAL" }, { VO_NTSC, "NTSC" }, { VO_VGA, "VGA" }, 123 { VO_PAL, "PAL" }, { VO_NTSC, "NTSC" }, { VO_VGA, "VGA" },
124}; 124};
125 125
@@ -228,7 +228,7 @@ static struct fb_ops pvr2fb_ops = {
228 .fb_imageblit = cfb_imageblit, 228 .fb_imageblit = cfb_imageblit,
229}; 229};
230 230
231static struct fb_videomode pvr2_modedb[] __initdata = { 231static struct fb_videomode pvr2_modedb[] __devinitdata = {
232 /* 232 /*
233 * Broadcast video modes (PAL and NTSC). I'm unfamiliar with 233 * Broadcast video modes (PAL and NTSC). I'm unfamiliar with
234 * PAL-M and PAL-N, but from what I've read both modes parallel PAL and 234 * PAL-M and PAL-N, but from what I've read both modes parallel PAL and
@@ -258,7 +258,7 @@ static struct fb_videomode pvr2_modedb[] __initdata = {
258#define DEFMODE_VGA 2 258#define DEFMODE_VGA 2
259 259
260static int defmode = DEFMODE_NTSC; 260static int defmode = DEFMODE_NTSC;
261static char *mode_option __initdata = NULL; 261static char *mode_option __devinitdata = NULL;
262 262
263static inline void pvr2fb_set_pal_type(unsigned int type) 263static inline void pvr2fb_set_pal_type(unsigned int type)
264{ 264{
@@ -761,7 +761,7 @@ out_unmap:
761 * in for flexibility anyways. Who knows, maybe someone has tv-out on a 761 * in for flexibility anyways. Who knows, maybe someone has tv-out on a
762 * PCI-based version of these things ;-) 762 * PCI-based version of these things ;-)
763 */ 763 */
764static int __init pvr2fb_common_init(void) 764static int __devinit pvr2fb_common_init(void)
765{ 765{
766 struct pvr2fb_par *par = currentpar; 766 struct pvr2fb_par *par = currentpar;
767 unsigned long modememused, rev; 767 unsigned long modememused, rev;
@@ -989,7 +989,7 @@ static void __exit pvr2fb_pci_exit(void)
989} 989}
990#endif /* CONFIG_PCI */ 990#endif /* CONFIG_PCI */
991 991
992static int __init pvr2_get_param(const struct pvr2_params *p, const char *s, 992static int __devinit pvr2_get_param(const struct pvr2_params *p, const char *s,
993 int val, int size) 993 int val, int size)
994{ 994{
995 int i; 995 int i;