diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-07-17 07:05:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:11 -0400 |
| commit | 2f7bb99fc9eb7a3d3840dc0a507049b7be1daba8 (patch) | |
| tree | 4350d15ad49e714b96a8a073473c5d4558c86ebc | |
| parent | ac1ae162c9c400d63e62d9f2878be968b10ceaab (diff) | |
pm2fb: white spaces clean up
This patch removes trailing spaces and tabs and spaces before tabs.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/video/pm2fb.c | 202 |
1 files changed, 101 insertions, 101 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 0a04483aa3e0..10c0cc6e93fc 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * License. See the file COPYING in the main directory of this archive for | 24 | * License. See the file COPYING in the main directory of this archive for |
| 25 | * more details. | 25 | * more details. |
| 26 | * | 26 | * |
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| @@ -58,7 +58,7 @@ | |||
| 58 | #endif | 58 | #endif |
| 59 | 59 | ||
| 60 | /* | 60 | /* |
| 61 | * Driver data | 61 | * Driver data |
| 62 | */ | 62 | */ |
| 63 | static char *mode __devinitdata = NULL; | 63 | static char *mode __devinitdata = NULL; |
| 64 | 64 | ||
| @@ -82,12 +82,12 @@ struct pm2fb_par | |||
| 82 | { | 82 | { |
| 83 | pm2type_t type; /* Board type */ | 83 | pm2type_t type; /* Board type */ |
| 84 | unsigned char __iomem *v_regs;/* virtual address of p_regs */ | 84 | unsigned char __iomem *v_regs;/* virtual address of p_regs */ |
| 85 | u32 memclock; /* memclock */ | 85 | u32 memclock; /* memclock */ |
| 86 | u32 video; /* video flags before blanking */ | 86 | u32 video; /* video flags before blanking */ |
| 87 | u32 mem_config; /* MemConfig reg at probe */ | 87 | u32 mem_config; /* MemConfig reg at probe */ |
| 88 | u32 mem_control; /* MemControl reg at probe */ | 88 | u32 mem_control; /* MemControl reg at probe */ |
| 89 | u32 boot_address; /* BootAddress reg at probe */ | 89 | u32 boot_address; /* BootAddress reg at probe */ |
| 90 | u32 palette[16]; | 90 | u32 palette[16]; |
| 91 | }; | 91 | }; |
| 92 | 92 | ||
| 93 | /* | 93 | /* |
| @@ -95,12 +95,12 @@ struct pm2fb_par | |||
| 95 | * if we don't use modedb. | 95 | * if we don't use modedb. |
| 96 | */ | 96 | */ |
| 97 | static struct fb_fix_screeninfo pm2fb_fix __devinitdata = { | 97 | static struct fb_fix_screeninfo pm2fb_fix __devinitdata = { |
| 98 | .id = "", | 98 | .id = "", |
| 99 | .type = FB_TYPE_PACKED_PIXELS, | 99 | .type = FB_TYPE_PACKED_PIXELS, |
| 100 | .visual = FB_VISUAL_PSEUDOCOLOR, | 100 | .visual = FB_VISUAL_PSEUDOCOLOR, |
| 101 | .xpanstep = 1, | 101 | .xpanstep = 1, |
| 102 | .ypanstep = 1, | 102 | .ypanstep = 1, |
| 103 | .ywrapstep = 0, | 103 | .ywrapstep = 0, |
| 104 | .accel = FB_ACCEL_3DLABS_PERMEDIA2, | 104 | .accel = FB_ACCEL_3DLABS_PERMEDIA2, |
| 105 | }; | 105 | }; |
| 106 | 106 | ||
| @@ -109,26 +109,26 @@ static struct fb_fix_screeninfo pm2fb_fix __devinitdata = { | |||
| 109 | */ | 109 | */ |
| 110 | static struct fb_var_screeninfo pm2fb_var __devinitdata = { | 110 | static struct fb_var_screeninfo pm2fb_var __devinitdata = { |
| 111 | /* "640x480, 8 bpp @ 60 Hz */ | 111 | /* "640x480, 8 bpp @ 60 Hz */ |
| 112 | .xres = 640, | 112 | .xres = 640, |
| 113 | .yres = 480, | 113 | .yres = 480, |
| 114 | .xres_virtual = 640, | 114 | .xres_virtual = 640, |
| 115 | .yres_virtual = 480, | 115 | .yres_virtual = 480, |
| 116 | .bits_per_pixel =8, | 116 | .bits_per_pixel = 8, |
| 117 | .red = {0, 8, 0}, | 117 | .red = {0, 8, 0}, |
| 118 | .blue = {0, 8, 0}, | 118 | .blue = {0, 8, 0}, |
| 119 | .green = {0, 8, 0}, | 119 | .green = {0, 8, 0}, |
| 120 | .activate = FB_ACTIVATE_NOW, | 120 | .activate = FB_ACTIVATE_NOW, |
| 121 | .height = -1, | 121 | .height = -1, |
| 122 | .width = -1, | 122 | .width = -1, |
| 123 | .accel_flags = 0, | 123 | .accel_flags = 0, |
| 124 | .pixclock = 39721, | 124 | .pixclock = 39721, |
| 125 | .left_margin = 40, | 125 | .left_margin = 40, |
| 126 | .right_margin = 24, | 126 | .right_margin = 24, |
| 127 | .upper_margin = 32, | 127 | .upper_margin = 32, |
| 128 | .lower_margin = 11, | 128 | .lower_margin = 11, |
| 129 | .hsync_len = 96, | 129 | .hsync_len = 96, |
| 130 | .vsync_len = 2, | 130 | .vsync_len = 2, |
| 131 | .vmode = FB_VMODE_NONINTERLACED | 131 | .vmode = FB_VMODE_NONINTERLACED |
| 132 | }; | 132 | }; |
| 133 | 133 | ||
| 134 | /* | 134 | /* |
| @@ -166,7 +166,7 @@ static inline u32 pm2_RDAC_RD(struct pm2fb_par* p, s32 idx) | |||
| 166 | pm2_WR(p, PM2VR_RD_INDEX_LOW, idx & 0xff); | 166 | pm2_WR(p, PM2VR_RD_INDEX_LOW, idx & 0xff); |
| 167 | index = PM2VR_RD_INDEXED_DATA; | 167 | index = PM2VR_RD_INDEXED_DATA; |
| 168 | break; | 168 | break; |
| 169 | } | 169 | } |
| 170 | mb(); | 170 | mb(); |
| 171 | return pm2_RD(p, index); | 171 | return pm2_RD(p, index); |
| 172 | } | 172 | } |
| @@ -182,7 +182,7 @@ static inline void pm2_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) | |||
| 182 | pm2_WR(p, PM2VR_RD_INDEX_LOW, idx & 0xff); | 182 | pm2_WR(p, PM2VR_RD_INDEX_LOW, idx & 0xff); |
| 183 | index = PM2VR_RD_INDEXED_DATA; | 183 | index = PM2VR_RD_INDEXED_DATA; |
| 184 | break; | 184 | break; |
| 185 | } | 185 | } |
| 186 | wmb(); | 186 | wmb(); |
| 187 | pm2_WR(p, index, v); | 187 | pm2_WR(p, index, v); |
| 188 | wmb(); | 188 | wmb(); |
| @@ -197,7 +197,7 @@ static inline void pm2v_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) | |||
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | #ifdef CONFIG_FB_PM2_FIFO_DISCONNECT | 199 | #ifdef CONFIG_FB_PM2_FIFO_DISCONNECT |
| 200 | #define WAIT_FIFO(p,a) | 200 | #define WAIT_FIFO(p, a) |
| 201 | #else | 201 | #else |
| 202 | static inline void WAIT_FIFO(struct pm2fb_par* p, u32 a) | 202 | static inline void WAIT_FIFO(struct pm2fb_par* p, u32 a) |
| 203 | { | 203 | { |
| @@ -209,7 +209,7 @@ static inline void WAIT_FIFO(struct pm2fb_par* p, u32 a) | |||
| 209 | /* | 209 | /* |
| 210 | * partial products for the supported horizontal resolutions. | 210 | * partial products for the supported horizontal resolutions. |
| 211 | */ | 211 | */ |
| 212 | #define PACKPP(p0,p1,p2) (((p2) << 6) | ((p1) << 3) | (p0)) | 212 | #define PACKPP(p0, p1, p2) (((p2) << 6) | ((p1) << 3) | (p0)) |
| 213 | static const struct { | 213 | static const struct { |
| 214 | u16 width; | 214 | u16 width; |
| 215 | u16 pp; | 215 | u16 pp; |
| @@ -357,7 +357,7 @@ static void reset_card(struct pm2fb_par* p) | |||
| 357 | static void reset_config(struct pm2fb_par* p) | 357 | static void reset_config(struct pm2fb_par* p) |
| 358 | { | 358 | { |
| 359 | WAIT_FIFO(p, 52); | 359 | WAIT_FIFO(p, 52); |
| 360 | pm2_WR(p, PM2R_CHIP_CONFIG, pm2_RD(p, PM2R_CHIP_CONFIG)& | 360 | pm2_WR(p, PM2R_CHIP_CONFIG, pm2_RD(p, PM2R_CHIP_CONFIG) & |
| 361 | ~(PM2F_VGA_ENABLE|PM2F_VGA_FIXED)); | 361 | ~(PM2F_VGA_ENABLE|PM2F_VGA_FIXED)); |
| 362 | pm2_WR(p, PM2R_BYPASS_WRITE_MASK, ~(0L)); | 362 | pm2_WR(p, PM2R_BYPASS_WRITE_MASK, ~(0L)); |
| 363 | pm2_WR(p, PM2R_FRAMEBUFFER_WRITE_MASK, ~(0L)); | 363 | pm2_WR(p, PM2R_FRAMEBUFFER_WRITE_MASK, ~(0L)); |
| @@ -367,7 +367,7 @@ static void reset_config(struct pm2fb_par* p) | |||
| 367 | pm2_WR(p, PM2R_RASTERIZER_MODE, 0); | 367 | pm2_WR(p, PM2R_RASTERIZER_MODE, 0); |
| 368 | pm2_WR(p, PM2R_DELTA_MODE, PM2F_DELTA_ORDER_RGB); | 368 | pm2_WR(p, PM2R_DELTA_MODE, PM2F_DELTA_ORDER_RGB); |
| 369 | pm2_WR(p, PM2R_LB_READ_FORMAT, 0); | 369 | pm2_WR(p, PM2R_LB_READ_FORMAT, 0); |
| 370 | pm2_WR(p, PM2R_LB_WRITE_FORMAT, 0); | 370 | pm2_WR(p, PM2R_LB_WRITE_FORMAT, 0); |
| 371 | pm2_WR(p, PM2R_LB_READ_MODE, 0); | 371 | pm2_WR(p, PM2R_LB_READ_MODE, 0); |
| 372 | pm2_WR(p, PM2R_LB_SOURCE_OFFSET, 0); | 372 | pm2_WR(p, PM2R_LB_SOURCE_OFFSET, 0); |
| 373 | pm2_WR(p, PM2R_FB_SOURCE_OFFSET, 0); | 373 | pm2_WR(p, PM2R_FB_SOURCE_OFFSET, 0); |
| @@ -535,7 +535,7 @@ static void set_video(struct pm2fb_par* p, u32 video) { | |||
| 535 | vsync = video; | 535 | vsync = video; |
| 536 | 536 | ||
| 537 | DPRINTK("video = 0x%x\n", video); | 537 | DPRINTK("video = 0x%x\n", video); |
| 538 | 538 | ||
| 539 | /* | 539 | /* |
| 540 | * The hardware cursor needs +vsync to recognise vert retrace. | 540 | * The hardware cursor needs +vsync to recognise vert retrace. |
| 541 | * We may not be using the hardware cursor, but the X Glint | 541 | * We may not be using the hardware cursor, but the X Glint |
| @@ -574,9 +574,9 @@ static void set_video(struct pm2fb_par* p, u32 video) { | |||
| 574 | */ | 574 | */ |
| 575 | 575 | ||
| 576 | /** | 576 | /** |
| 577 | * pm2fb_check_var - Optional function. Validates a var passed in. | 577 | * pm2fb_check_var - Optional function. Validates a var passed in. |
| 578 | * @var: frame buffer variable screen structure | 578 | * @var: frame buffer variable screen structure |
| 579 | * @info: frame buffer structure that represents a single frame buffer | 579 | * @info: frame buffer structure that represents a single frame buffer |
| 580 | * | 580 | * |
| 581 | * Checks to see if the hardware supports the state requested by | 581 | * Checks to see if the hardware supports the state requested by |
| 582 | * var passed in. | 582 | * var passed in. |
| @@ -615,23 +615,23 @@ static int pm2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) | |||
| 615 | 615 | ||
| 616 | var->xres = (var->xres + 15) & ~15; /* could somet | ||
