aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/geode
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/geode')
-rw-r--r--drivers/video/geode/gx1fb_core.c14
-rw-r--r--drivers/video/geode/gxfb_core.c20
-rw-r--r--drivers/video/geode/lxfb_core.c20
3 files changed, 23 insertions, 31 deletions
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 265c5ed59ade..ebbaada7b941 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -29,7 +29,7 @@ static int crt_option = 1;
29static char panel_option[32] = ""; 29static char panel_option[32] = "";
30 30
31/* Modes relevant to the GX1 (taken from modedb.c) */ 31/* Modes relevant to the GX1 (taken from modedb.c) */
32static const struct fb_videomode __devinitconst gx1_modedb[] = { 32static const struct fb_videomode gx1_modedb[] = {
33 /* 640x480-60 VESA */ 33 /* 640x480-60 VESA */
34 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, 34 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
35 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 35 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -195,7 +195,7 @@ static int gx1fb_blank(int blank_mode, struct fb_info *info)
195 return par->vid_ops->blank_display(info, blank_mode); 195 return par->vid_ops->blank_display(info, blank_mode);
196} 196}
197 197
198static int __devinit gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev) 198static int gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
199{ 199{
200 struct geodefb_par *par = info->par; 200 struct geodefb_par *par = info->par;
201 unsigned gx_base; 201 unsigned gx_base;
@@ -268,7 +268,7 @@ static struct fb_ops gx1fb_ops = {
268 .fb_imageblit = cfb_imageblit, 268 .fb_imageblit = cfb_imageblit,
269}; 269};
270 270
271static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev) 271static struct fb_info *gx1fb_init_fbinfo(struct device *dev)
272{ 272{
273 struct geodefb_par *par; 273 struct geodefb_par *par;
274 struct fb_info *info; 274 struct fb_info *info;
@@ -318,7 +318,7 @@ static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev)
318 return info; 318 return info;
319} 319}
320 320
321static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 321static int gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
322{ 322{
323 struct geodefb_par *par; 323 struct geodefb_par *par;
324 struct fb_info *info; 324 struct fb_info *info;
@@ -382,7 +382,7 @@ static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_i
382 return ret; 382 return ret;
383} 383}
384 384
385static void __devexit gx1fb_remove(struct pci_dev *pdev) 385static void gx1fb_remove(struct pci_dev *pdev)
386{ 386{
387 struct fb_info *info = pci_get_drvdata(pdev); 387 struct fb_info *info = pci_get_drvdata(pdev);
388 struct geodefb_par *par = info->par; 388 struct geodefb_par *par = info->par;
@@ -441,7 +441,7 @@ static struct pci_driver gx1fb_driver = {
441 .name = "gx1fb", 441 .name = "gx1fb",
442 .id_table = gx1fb_id_table, 442 .id_table = gx1fb_id_table,
443 .probe = gx1fb_probe, 443 .probe = gx1fb_probe,
444 .remove = __devexit_p(gx1fb_remove), 444 .remove = gx1fb_remove,
445}; 445};
446 446
447static int __init gx1fb_init(void) 447static int __init gx1fb_init(void)
@@ -456,7 +456,7 @@ static int __init gx1fb_init(void)
456 return pci_register_driver(&gx1fb_driver); 456 return pci_register_driver(&gx1fb_driver);
457} 457}
458 458
459static void __devexit gx1fb_cleanup(void) 459static void gx1fb_cleanup(void)
460{ 460{
461 pci_unregister_driver(&gx1fb_driver); 461 pci_unregister_driver(&gx1fb_driver);
462} 462}
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index b4f19db9bb54..19f0c1add747 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -40,7 +40,7 @@ static int vram;
40static int vt_switch; 40static int vt_switch;
41 41
42/* Modes relevant to the GX (taken from modedb.c) */ 42/* Modes relevant to the GX (taken from modedb.c) */
43static struct fb_videomode gx_modedb[] __devinitdata = { 43static struct fb_videomode gx_modedb[] = {
44 /* 640x480-60 VESA */ 44 /* 640x480-60 VESA */
45 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, 45 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
46 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 46 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -110,15 +110,14 @@ static struct fb_videomode gx_modedb[] __devinitdata = {
110#ifdef CONFIG_OLPC 110#ifdef CONFIG_OLPC
111#include <asm/olpc.h> 111#include <asm/olpc.h>
112 112
113static struct fb_videomode gx_dcon_modedb[] __devinitdata = { 113static struct fb_videomode gx_dcon_modedb[] = {
114 /* The only mode the DCON has is 1200x900 */ 114 /* The only mode the DCON has is 1200x900 */
115 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, 115 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
116 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 116 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
117 FB_VMODE_NONINTERLACED, 0 } 117 FB_VMODE_NONINTERLACED, 0 }
118}; 118};
119 119
120static void __devinit get_modedb(struct fb_videomode **modedb, 120static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
121 unsigned int *size)
122{ 121{
123 if (olpc_has_dcon()) { 122 if (olpc_has_dcon()) {
124 *modedb = (struct fb_videomode *) gx_dcon_modedb; 123 *modedb = (struct fb_videomode *) gx_dcon_modedb;
@@ -130,8 +129,7 @@ static void __devinit get_modedb(struct fb_videomode **modedb,
130} 129}
131 130
132#else 131#else
133static void __devinit get_modedb(struct fb_videomode **modedb, 132static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
134 unsigned int *size)
135{ 133{
136 *modedb = (struct fb_videomode *) gx_modedb; 134 *modedb = (struct fb_videomode *) gx_modedb;
137 *size = ARRAY_SIZE(gx_modedb); 135 *size = ARRAY_SIZE(gx_modedb);
@@ -228,8 +226,7 @@ static int gxfb_blank(int blank_mode, struct fb_info *info)
228 return gx_blank_display(info, blank_mode); 226 return gx_blank_display(info, blank_mode);
229} 227}
230 228
231static int __devinit gxfb_map_video_memory(struct fb_info *info, 229static int gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
232 struct pci_dev *dev)
233{ 230{
234 struct gxfb_par *par = info->par; 231 struct gxfb_par *par = info->par;
235 int ret; 232 int ret;
@@ -293,7 +290,7 @@ static struct fb_ops gxfb_ops = {
293 .fb_imageblit = cfb_imageblit, 290 .fb_imageblit = cfb_imageblit,
294}; 291};
295 292
296static struct fb_info *__devinit gxfb_init_fbinfo(struct device *dev) 293static struct fb_info *gxfb_init_fbinfo(struct device *dev)
297{ 294{
298 struct gxfb_par *par; 295 struct gxfb_par *par;
299 struct fb_info *info; 296 struct fb_info *info;
@@ -374,8 +371,7 @@ static int gxfb_resume(struct pci_dev *pdev)
374} 371}
375#endif 372#endif
376 373
377static int __devinit gxfb_probe(struct pci_dev *pdev, 374static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
378 const struct pci_device_id *id)
379{ 375{
380 struct gxfb_par *par; 376 struct gxfb_par *par;
381 struct fb_info *info; 377 struct fb_info *info;
@@ -455,7 +451,7 @@ static int __devinit gxfb_probe(struct pci_dev *pdev,
455 return ret; 451 return ret;
456} 452}
457 453
458static void __devexit gxfb_remove(struct pci_dev *pdev) 454static void gxfb_remove(struct pci_dev *pdev)
459{ 455{
460 struct fb_info *info = pci_get_drvdata(pdev); 456 struct fb_info *info = pci_get_drvdata(pdev);
461 struct gxfb_par *par = info->par; 457 struct gxfb_par *par = info->par;
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index 416851ca8754..4dd7b5566962 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -35,7 +35,7 @@ static int vt_switch;
35 * we try to make it something sane - 640x480-60 is sane 35 * we try to make it something sane - 640x480-60 is sane
36 */ 36 */
37 37
38static struct fb_videomode geode_modedb[] __devinitdata = { 38static struct fb_videomode geode_modedb[] = {
39 /* 640x480-60 */ 39 /* 640x480-60 */
40 { NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2, 40 { NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2,
41 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 41 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
@@ -219,15 +219,14 @@ static struct fb_videomode geode_modedb[] __devinitdata = {
219#ifdef CONFIG_OLPC 219#ifdef CONFIG_OLPC
220#include <asm/olpc.h> 220#include <asm/olpc.h>
221 221
222static struct fb_videomode olpc_dcon_modedb[] __devinitdata = { 222static struct fb_videomode olpc_dcon_modedb[] = {
223 /* The only mode the DCON has is 1200x900 */ 223 /* The only mode the DCON has is 1200x900 */
224 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, 224 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
225 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 225 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
226 FB_VMODE_NONINTERLACED, 0 } 226 FB_VMODE_NONINTERLACED, 0 }
227}; 227};
228 228
229static void __devinit get_modedb(struct fb_videomode **modedb, 229static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
230 unsigned int *size)
231{ 230{
232 if (olpc_has_dcon()) { 231 if (olpc_has_dcon()) {
233 *modedb = (struct fb_videomode *) olpc_dcon_modedb; 232 *modedb = (struct fb_videomode *) olpc_dcon_modedb;
@@ -239,8 +238,7 @@ static void __devinit get_modedb(struct fb_videomode **modedb,
239} 238}
240 239
241#else 240#else
242static void __devinit get_modedb(struct fb_videomode **modedb, 241static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
243 unsigned int *size)
244{ 242{
245 *modedb = (struct fb_videomode *) geode_modedb; 243 *modedb = (struct fb_videomode *) geode_modedb;
246 *size = ARRAY_SIZE(geode_modedb); 244 *size = ARRAY_SIZE(geode_modedb);
@@ -336,8 +334,7 @@ static int lxfb_blank(int blank_mode, struct fb_info *info)
336} 334}
337 335
338 336
339static int __devinit lxfb_map_video_memory(struct fb_info *info, 337static int lxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
340 struct pci_dev *dev)
341{ 338{
342 struct lxfb_par *par = info->par; 339 struct lxfb_par *par = info->par;
343 int ret; 340 int ret;
@@ -414,7 +411,7 @@ static struct fb_ops lxfb_ops = {
414 .fb_imageblit = cfb_imageblit, 411 .fb_imageblit = cfb_imageblit,
415}; 412};
416 413
417static struct fb_info * __devinit lxfb_init_fbinfo(struct device *dev) 414static struct fb_info *lxfb_init_fbinfo(struct device *dev)
418{ 415{
419 struct lxfb_par *par; 416 struct lxfb_par *par;
420 struct fb_info *info; 417 struct fb_info *info;
@@ -498,8 +495,7 @@ static int lxfb_resume(struct pci_dev *pdev)
498#define lxfb_resume NULL 495#define lxfb_resume NULL
499#endif 496#endif
500 497
501static int __devinit lxfb_probe(struct pci_dev *pdev, 498static int lxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
502 const struct pci_device_id *id)
503{ 499{
504 struct lxfb_par *par; 500 struct lxfb_par *par;
505 struct fb_info *info; 501 struct fb_info *info;
@@ -590,7 +586,7 @@ err:
590 return ret; 586 return ret;
591} 587}
592 588
593static void __devexit lxfb_remove(struct pci_dev *pdev) 589static void lxfb_remove(struct pci_dev *pdev)
594{ 590{
595 struct fb_info *info = pci_get_drvdata(pdev); 591 struct fb_info *info = pci_get_drvdata(pdev);
596 struct lxfb_par *par = info->par; 592 struct lxfb_par *par = info->par;
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-01 12:28:17 -0500