aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/metronomefb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/metronomefb.c')
-rw-r--r--drivers/video/metronomefb.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index 97d45e5115e2..f30150d71be9 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -99,7 +99,7 @@ static struct epd_frame epd_frame_table[] = {
99 }, 99 },
100}; 100};
101 101
102static struct fb_fix_screeninfo metronomefb_fix __devinitdata = { 102static struct fb_fix_screeninfo metronomefb_fix = {
103 .id = "metronomefb", 103 .id = "metronomefb",
104 .type = FB_TYPE_PACKED_PIXELS, 104 .type = FB_TYPE_PACKED_PIXELS,
105 .visual = FB_VISUAL_STATIC_PSEUDOCOLOR, 105 .visual = FB_VISUAL_STATIC_PSEUDOCOLOR,
@@ -110,7 +110,7 @@ static struct fb_fix_screeninfo metronomefb_fix __devinitdata = {
110 .accel = FB_ACCEL_NONE, 110 .accel = FB_ACCEL_NONE,
111}; 111};
112 112
113static struct fb_var_screeninfo metronomefb_var __devinitdata = { 113static struct fb_var_screeninfo metronomefb_var = {
114 .xres = DPY_W, 114 .xres = DPY_W,
115 .yres = DPY_H, 115 .yres = DPY_H,
116 .xres_virtual = DPY_W, 116 .xres_virtual = DPY_W,
@@ -167,8 +167,8 @@ static u16 calc_img_cksum(u16 *start, int length)
167} 167}
168 168
169/* here we decode the incoming waveform file and populate metromem */ 169/* here we decode the incoming waveform file and populate metromem */
170static int __devinit load_waveform(u8 *mem, size_t size, int m, int t, 170static int load_waveform(u8 *mem, size_t size, int m, int t,
171 struct metronomefb_par *par) 171 struct metronomefb_par *par)
172{ 172{
173 int tta; 173 int tta;
174 int wmta; 174 int wmta;
@@ -338,7 +338,7 @@ static int metronome_display_cmd(struct metronomefb_par *par)
338 return par->board->met_wait_event_intr(par); 338 return par->board->met_wait_event_intr(par);
339} 339}
340 340
341static int __devinit metronome_powerup_cmd(struct metronomefb_par *par) 341static int metronome_powerup_cmd(struct metronomefb_par *par)
342{ 342{
343 int i; 343 int i;
344 u16 cs; 344 u16 cs;
@@ -367,7 +367,7 @@ static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
367 return par->board->met_wait_event(par); 367 return par->board->met_wait_event(par);
368} 368}
369 369
370static int __devinit metronome_config_cmd(struct metronomefb_par *par) 370static int metronome_config_cmd(struct metronomefb_par *par)
371{ 371{
372 /* setup config command 372 /* setup config command
373 we can't immediately set the opcode since the controller 373 we can't immediately set the opcode since the controller
@@ -385,7 +385,7 @@ static int __devinit metronome_config_cmd(struct metronomefb_par *par)
385 return par->board->met_wait_event(par); 385 return par->board->met_wait_event(par);
386} 386}
387 387
388static int __devinit metronome_init_cmd(struct metronomefb_par *par) 388static int metronome_init_cmd(struct metronomefb_par *par)
389{ 389{
390 int i; 390 int i;
391 u16 cs; 391 u16 cs;
@@ -411,7 +411,7 @@ static int __devinit metronome_init_cmd(struct metronomefb_par *par)
411 return par->board->met_wait_event(par); 411 return par->board->met_wait_event(par);
412} 412}
413 413
414static int __devinit metronome_init_regs(struct metronomefb_par *par) 414static int metronome_init_regs(struct metronomefb_par *par)
415{ 415{
416 int res; 416 int res;
417 417
@@ -569,7 +569,7 @@ static struct fb_deferred_io metronomefb_defio = {
569 .deferred_io = metronomefb_dpy_deferred_io, 569 .deferred_io = metronomefb_dpy_deferred_io,
570}; 570};
571 571
572static int __devinit metronomefb_probe(struct platform_device *dev) 572static int metronomefb_probe(struct platform_device *dev)
573{ 573{
574 struct fb_info *info; 574 struct fb_info *info;
575 struct metronome_board *board; 575 struct metronome_board *board;
@@ -741,7 +741,7 @@ err:
741 return retval; 741 return retval;
742} 742}
743 743
744static int __devexit metronomefb_remove(struct platform_device *dev) 744static int metronomefb_remove(struct platform_device *dev)
745{ 745{
746 struct fb_info *info = platform_get_drvdata(dev); 746 struct fb_info *info = platform_get_drvdata(dev);
747 747
@@ -763,7 +763,7 @@ static int __devexit metronomefb_remove(struct platform_device *dev)
763 763
764static struct platform_driver metronomefb_driver = { 764static struct platform_driver metronomefb_driver = {
765 .probe = metronomefb_probe, 765 .probe = metronomefb_probe,
766 .remove = __devexit_p(metronomefb_remove), 766 .remove = metronomefb_remove,
767 .driver = { 767 .driver = {
768 .owner = THIS_MODULE, 768 .owner = THIS_MODULE,
769 .name = "metronomefb", 769 .name = "metronomefb",