Commit 071bc923308832bbc541a887fece767d79a6dc7a
1 parent
57ff9f2421
Exists in
master
and in
54 other branches
Coding Style cleanup
Signed-off-by: Wolfgang Denk <wd@denx.de>
Showing 22 changed files with 117 additions and 162 deletions Side-by-side Diff
- MAKEALL
- README
- arch/arm/cpu/pxa/cpu.c
- arch/microblaze/cpu/start.S
- arch/sh/lib/bootm.c
- board/bct-brettl2/cled.c
- board/xes/common/fsl_8xxx_misc.c
- board/xes/xpedite550x/ddr.c
- doc/README.arm-relocation
- drivers/serial/atmel_usart.h
- include/configs/a4m072.h
- include/configs/bct-brettl2.h
- include/configs/blackvme.h
- include/configs/mx1ads.h
- include/configs/mx1fs2.h
- include/configs/scb9328.h
- include/linux/fb.h
- include/linux/kbuild.h
- include/linux/usb/cdc.h
- lib/hashtable.c
- lib/qsort.c
- post/board/lwmon5/fpga.c
MAKEALL
... | ... | @@ -56,7 +56,7 @@ |
56 | 56 | |
57 | 57 | # Option processing based on util-linux-2.13/getopt-parse.bash |
58 | 58 | |
59 | -# Note that we use `"$@"' to let each command-line parameter expand to a | |
59 | +# Note that we use `"$@"' to let each command-line parameter expand to a | |
60 | 60 | # separate word. The quotes around `$@' are essential! |
61 | 61 | # We need TEMP as the `eval set --' would nuke the return value of |
62 | 62 | # getopt. |
README
... | ... | @@ -2364,11 +2364,11 @@ |
2364 | 2364 | |
2365 | 2365 | - CONFIG_ENV_MAX_ENTRIES |
2366 | 2366 | |
2367 | - Maximum number of entries in the hash table that is used | |
2368 | - internally to store the environment settings. The default | |
2369 | - setting is supposed to be generous and should work in most | |
2370 | - cases. This setting can be used to tune behaviour; see | |
2371 | - lib/hashtable.c for details. | |
2367 | + Maximum number of entries in the hash table that is used | |
2368 | + internally to store the environment settings. The default | |
2369 | + setting is supposed to be generous and should work in most | |
2370 | + cases. This setting can be used to tune behaviour; see | |
2371 | + lib/hashtable.c for details. | |
2372 | 2372 | |
2373 | 2373 | The following definitions that deal with the placement and management |
2374 | 2374 | of environment data (variable area); in general, we support the |
arch/arm/cpu/pxa/cpu.c
arch/microblaze/cpu/start.S
... | ... | @@ -98,7 +98,7 @@ |
98 | 98 | * 0xC: 0xB808XXXX |
99 | 99 | * |
100 | 100 | * then it is necessary to count address for storing the most significant |
101 | - * 16bits from _exception_handler address and copy it to | |
101 | + * 16bits from _exception_handler address and copy it to | |
102 | 102 | * 0xa address. Big endian use offset in r10=0 that's why is it just |
103 | 103 | * 0xa address. The same is done for the least significant 16 bits |
104 | 104 | * for 0xe address. |
arch/sh/lib/bootm.c
board/bct-brettl2/cled.c
board/xes/common/fsl_8xxx_misc.c
... | ... | @@ -52,10 +52,10 @@ |
52 | 52 | #endif |
53 | 53 | |
54 | 54 | /* |
55 | - * The top 4 lines of the local bus address are pulled low/high and | |
56 | - * can be read to determine the least significant digit of a board's | |
57 | - * model number. | |
58 | - */ | |
55 | + * The top 4 lines of the local bus address are pulled low/high and | |
56 | + * can be read to determine the least significant digit of a board's | |
57 | + * model number. | |
58 | + */ | |
59 | 59 | return gur->gpporcr >> 28; |
60 | 60 | } |
board/xes/xpedite550x/ddr.c
... | ... | @@ -55,16 +55,16 @@ |
55 | 55 | * There are traditionally three board-specific SDRAM timing parameters |
56 | 56 | * which must be calculated based on the particular PCB artwork. These are: |
57 | 57 | * 1.) CPO (Read Capture Delay) |
58 | - * - TIMING_CFG_2 register | |
59 | - * Source: Calculation based on board trace lengths and | |
60 | - * chip-specific internal delays. | |
58 | + * - TIMING_CFG_2 register | |
59 | + * Source: Calculation based on board trace lengths and | |
60 | + * chip-specific internal delays. | |
61 | 61 | * 2.) CLK_ADJUST (Clock and Addr/Cmd alignment control) |
62 | - * - DDR_SDRAM_CLK_CNTL register | |
63 | - * Source: Signal Integrity Simulations | |
62 | + * - DDR_SDRAM_CLK_CNTL register | |
63 | + * Source: Signal Integrity Simulations | |
64 | 64 | * 3.) 2T Timing on Addr/Ctl |
65 | - * - TIMING_CFG_2 register | |
66 | - * Source: Signal Integrity Simulations | |
67 | - * Usually only needed with heavy load/very high speed (>DDR2-800) | |
65 | + * - TIMING_CFG_2 register | |
66 | + * Source: Signal Integrity Simulations | |
67 | + * Usually only needed with heavy load/very high speed (>DDR2-800) | |
68 | 68 | * |
69 | 69 | * ====== XPedite550x DDR3-800 read delay calculations ====== |
70 | 70 | * |
71 | 71 | |
... | ... | @@ -82,14 +82,14 @@ |
82 | 82 | const board_specific_parameters_t board_specific_parameters[][20] = { |
83 | 83 | { |
84 | 84 | /* Controller 0 */ |
85 | - { | |
85 | + { | |
86 | 86 | /* DDR3-600/667 */ |
87 | 87 | .datarate_mhz_low = 500, |
88 | 88 | .datarate_mhz_high = 750, |
89 | 89 | .clk_adjust = 5, |
90 | 90 | .cpo = 31, |
91 | 91 | }, |
92 | - { | |
92 | + { | |
93 | 93 | /* DDR3-800 */ |
94 | 94 | .datarate_mhz_low = 750, |
95 | 95 | .datarate_mhz_high = 850, |
doc/README.arm-relocation
... | ... | @@ -93,7 +93,7 @@ |
93 | 93 | and start with code execution on this address. |
94 | 94 | |
95 | 95 | - The First page contains u-boot code from u-boot:nand_spl/nand_boot_fsl_nfc.c |
96 | - which inits the dram, cpu registers, reloacte itself to CONFIG_SYS_TEXT_BASE and loads | |
96 | + which inits the dram, cpu registers, reloacte itself to CONFIG_SYS_TEXT_BASE and loads | |
97 | 97 | the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution |
98 | 98 | @CONFIG_SYS_NAND_U_BOOT_START |
99 | 99 | |
... | ... | @@ -162,7 +162,7 @@ |
162 | 162 | |
163 | 163 | (gdb) add-symbol-file u-boot 0x8ff08000 |
164 | 164 | add symbol table from file "u-boot" at |
165 | - .text_addr = 0x8ff08000 | |
165 | + .text_addr = 0x8ff08000 | |
166 | 166 | (y or n) y |
167 | 167 | Reading symbols from /home/hs/celf/u-boot/u-boot...done. |
168 | 168 | (gdb) c |
169 | 169 | |
... | ... | @@ -170,12 +170,12 @@ |
170 | 170 | ^C |
171 | 171 | Program received signal SIGSTOP, Stopped (signal). |
172 | 172 | 0x8ff17f18 in serial_getc () at serial_mxc.c:192 |
173 | -192 while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY); | |
173 | +192 while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY); | |
174 | 174 | (gdb) |
175 | 175 | |
176 | 176 | add-symbol-file u-boot 0x8ff08000 |
177 | - ^^^^^^^^^^ | |
178 | - get this address from u-boot debug printfs | |
177 | + ^^^^^^^^^^ | |
178 | + get this address from u-boot debug printfs | |
179 | 179 | |
180 | 180 | U-Boot 2010.06-rc2-00009-gf77b8b8-dirty (Jun 22 2010 - 09:43:46) |
181 | 181 | |
... | ... | @@ -187,7 +187,7 @@ |
187 | 187 | LCD panel info: 640 x 480, 16 bit/pix |
188 | 188 | Reserving 600k for LCD Framebuffer at: 8ff6a000 |
189 | 189 | Reserving 391k for U-Boot at: 8ff08000 |
190 | - ^^^^^^^^ | |
190 | + ^^^^^^^^ | |
191 | 191 | Reserving 1280k for malloc() at: 8fdc8000 |
192 | 192 | Reserving 24 Bytes for Board Info at: 8fdc7fe8 |
193 | 193 | Reserving 52 Bytes for Global Data at: 8fdc7fb4 |
... | ... | @@ -197,7 +197,7 @@ |
197 | 197 | relocation Offset is: eff08000 |
198 | 198 | mon: 00058BAC gd->monLen: 00061F10 |
199 | 199 | Now running in RAM - U-Boot at: 8ff08000 |
200 | - ^^^^^^^^ | |
200 | + ^^^^^^^^ | |
201 | 201 | |
202 | 202 | Now you can use gdb as usual :-) |
drivers/serial/atmel_usart.h
include/configs/a4m072.h
include/configs/bct-brettl2.h
... | ... | @@ -11,7 +11,7 @@ |
11 | 11 | /* |
12 | 12 | * Processor Settings |
13 | 13 | */ |
14 | -#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS | |
14 | +#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS | |
15 | 15 | |
16 | 16 | |
17 | 17 | /* |
18 | 18 | |
... | ... | @@ -21,11 +21,11 @@ |
21 | 21 | */ |
22 | 22 | /* CONFIG_CLKIN_HZ is any value in Hz */ |
23 | 23 | #define CONFIG_CLKIN_HZ 16384000 |
24 | -/* CLKIN_HALF controls the DF bit in PLL_CTL 0 = CLKIN */ | |
25 | -/* 1 = CLKIN / 2 */ | |
24 | +/* CLKIN_HALF controls the DF bit in PLL_CTL 0 = CLKIN */ | |
25 | +/* 1 = CLKIN / 2 */ | |
26 | 26 | #define CONFIG_CLKIN_HALF 0 |
27 | 27 | /* PLL_BYPASS controls the BYPASS bit in PLL_CTL 0 = do not bypass */ |
28 | -/* 1 = bypass PLL */ | |
28 | +/* 1 = bypass PLL */ | |
29 | 29 | #define CONFIG_PLL_BYPASS 0 |
30 | 30 | /* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL */ |
31 | 31 | /* Values can range from 0-63 (where 0 means 64) */ |
... | ... | @@ -36,7 +36,7 @@ |
36 | 36 | /* SCLK_DIV controls the system clock divider */ |
37 | 37 | /* Values can range from 1-15 */ |
38 | 38 | #define CONFIG_SCLK_DIV 3 |
39 | -#define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000) | |
39 | +#define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000) | |
40 | 40 | |
41 | 41 | |
42 | 42 | /* |
... | ... | @@ -111,13 +111,13 @@ |
111 | 111 | * it linked after the configuration sector. |
112 | 112 | */ |
113 | 113 | # define LDS_BOARD_TEXT \ |
114 | - arch/blackfin/cpu/traps.o (.text .text.*); \ | |
115 | - arch/blackfin/cpu/interrupt.o (.text .text.*); \ | |
116 | - arch/blackfin/cpu/serial.o (.text .text.*); \ | |
117 | - common/dlmalloc.o (.text .text.*); \ | |
118 | - lib/crc32.o (.text .text.*); \ | |
119 | - . = DEFINED(env_offset) ? env_offset : .; \ | |
120 | - common/env_embedded.o (.text .text.*); | |
114 | + arch/blackfin/cpu/traps.o (.text .text.*); \ | |
115 | + arch/blackfin/cpu/interrupt.o (.text .text.*); \ | |
116 | + arch/blackfin/cpu/serial.o (.text .text.*); \ | |
117 | + common/dlmalloc.o (.text .text.*); \ | |
118 | + lib/crc32.o (.text .text.*); \ | |
119 | + . = DEFINED(env_offset) ? env_offset : .; \ | |
120 | + common/env_embedded.o (.text .text.*); | |
121 | 121 | #endif |
122 | 122 | |
123 | 123 |
include/configs/blackvme.h
... | ... | @@ -126,9 +126,9 @@ |
126 | 126 | * AX88180 WEN = 5 clocks REN 6 clocks @ SCLK = 100 MHz |
127 | 127 | * One extra clock needed because AX88180 is asynchronous to CPU. |
128 | 128 | */ |
129 | - /* bank 1 0 */ | |
129 | + /* bank 1 0 */ | |
130 | 130 | #define CONFIG_EBIU_AMBCTL0_VAL 0xFFC2FFC2 |
131 | - /* bank 3 2 */ | |
131 | + /* bank 3 2 */ | |
132 | 132 | #define CONFIG_EBIU_AMBCTL1_VAL 0xFFC2FFC2 |
133 | 133 | |
134 | 134 | /* memory layout */ |
include/configs/mx1ads.h
... | ... | @@ -60,8 +60,6 @@ |
60 | 60 | |
61 | 61 | #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) |
62 | 62 | |
63 | - | |
64 | - | |
65 | 63 | /* |
66 | 64 | * CS8900 Ethernet drivers |
67 | 65 | */ |
... | ... | @@ -79,7 +77,6 @@ |
79 | 77 | |
80 | 78 | #define CONFIG_BAUDRATE 115200 |
81 | 79 | |
82 | - | |
83 | 80 | /* |
84 | 81 | * BOOTP options |
85 | 82 | */ |
... | ... | @@ -88,7 +85,6 @@ |
88 | 85 | #define CONFIG_BOOTP_GATEWAY |
89 | 86 | #define CONFIG_BOOTP_HOSTNAME |
90 | 87 | |
91 | - | |
92 | 88 | /* |
93 | 89 | * Command line configuration. |
94 | 90 | */ |
... | ... | @@ -97,7 +93,6 @@ |
97 | 93 | #define CONFIG_CMD_CACHE |
98 | 94 | #define CONFIG_CMD_REGINFO |
99 | 95 | #define CONFIG_CMD_ELF |
100 | - | |
101 | 96 | |
102 | 97 | #define CONFIG_BOOTDELAY 3 |
103 | 98 | #define CONFIG_BOOTARGS "root=/dev/msdk mem=48M" |
include/configs/mx1fs2.h
... | ... | @@ -34,7 +34,6 @@ |
34 | 34 | #undef _CONFIG_UART4 /* internal uart 4 */ |
35 | 35 | #undef CONFIG_SILENT_CONSOLE /* use this to disable output */ |
36 | 36 | |
37 | - | |
38 | 37 | /* |
39 | 38 | * BOOTP options |
40 | 39 | */ |
... | ... | @@ -43,7 +42,6 @@ |
43 | 42 | #define CONFIG_BOOTP_GATEWAY |
44 | 43 | #define CONFIG_BOOTP_HOSTNAME |
45 | 44 | |
46 | - | |
47 | 45 | /* |
48 | 46 | * Command line configuration. |
49 | 47 | */ |
... | ... | @@ -58,7 +56,6 @@ |
58 | 56 | #undef CONFIG_CMD_PING |
59 | 57 | #undef CONFIG_CMD_SOURCE |
60 | 58 | |
61 | - | |
62 | 59 | /* |
63 | 60 | * Boot options. Setting delay to -1 stops autostart count down. |
64 | 61 | */ |
... | ... | @@ -97,8 +94,6 @@ |
97 | 94 | * Malloc pool need to host env + 128 Kb reserve for other allocations. |
98 | 95 | */ |
99 | 96 | #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) |
100 | - | |
101 | - | |
102 | 97 | |
103 | 98 | #define CONFIG_STACKSIZE (120<<10) /* stack size */ |
104 | 99 |
include/configs/scb9328.h
... | ... | @@ -35,7 +35,6 @@ |
35 | 35 | * Select serial console configuration |
36 | 36 | */ |
37 | 37 | |
38 | - | |
39 | 38 | /* |
40 | 39 | * BOOTP options |
41 | 40 | */ |
... | ... | @@ -44,7 +43,6 @@ |
44 | 43 | #define CONFIG_BOOTP_GATEWAY |
45 | 44 | #define CONFIG_BOOTP_HOSTNAME |
46 | 45 | |
47 | - | |
48 | 46 | /* |
49 | 47 | * Command line configuration. |
50 | 48 | */ |
... | ... | @@ -58,7 +56,6 @@ |
58 | 56 | #undef CONFIG_CMD_LOADS |
59 | 57 | #undef CONFIG_CMD_SOURCE |
60 | 58 | |
61 | - | |
62 | 59 | /* |
63 | 60 | * Boot options. Setting delay to -1 stops autostart count down. |
64 | 61 | * NOTE: Sending parameters to kernel depends on kernel version and |
65 | 62 | |
... | ... | @@ -100,14 +97,11 @@ |
100 | 97 | #define CONFIG_INITRD_TAG 1 /* send initrd params */ |
101 | 98 | #undef CONFIG_VFD /* do not send framebuffer setup */ |
102 | 99 | |
103 | - | |
104 | 100 | /* |
105 | 101 | * Malloc pool need to host env + 128 Kb reserve for other allocations. |
106 | 102 | */ |
107 | 103 | #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) |
108 | 104 | |
109 | - | |
110 | - | |
111 | 105 | #define CONFIG_STACKSIZE (120<<10) /* stack size */ |
112 | 106 | |
113 | 107 | #ifdef CONFIG_USE_IRQ |
... | ... | @@ -132,15 +126,6 @@ |
132 | 126 | #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of SDRAM */ |
133 | 127 | #define SCB9328_SDRAM_1 0x08000000 /* SDRAM bank #1 */ |
134 | 128 | #define SCB9328_SDRAM_1_SIZE 0x01000000 /* 16 MB */ |
135 | - | |
136 | -/* | |
137 | - * Flash Controller settings | |
138 | - */ | |
139 | - | |
140 | -/* | |
141 | - * Hardware drivers | |
142 | - */ | |
143 | - | |
144 | 129 | |
145 | 130 | /* |
146 | 131 | * Configuration for FLASH memory for the Synertronixx board |
include/linux/fb.h
... | ... | @@ -26,13 +26,13 @@ |
26 | 26 | __u32 type; /* see FB_TYPE_* */ |
27 | 27 | __u32 type_aux; /* Interleave for interleaved Planes */ |
28 | 28 | __u32 visual; /* see FB_VISUAL_* */ |
29 | - __u16 xpanstep; /* zero if no hardware panning */ | |
30 | - __u16 ypanstep; /* zero if no hardware panning */ | |
31 | - __u16 ywrapstep; /* zero if no hardware ywrap */ | |
32 | - __u32 line_length; /* length of a line in bytes */ | |
33 | - unsigned long mmio_start; /* Start of Memory Mapped I/O */ | |
29 | + __u16 xpanstep; /* zero if no hardware panning */ | |
30 | + __u16 ypanstep; /* zero if no hardware panning */ | |
31 | + __u16 ywrapstep; /* zero if no hardware ywrap */ | |
32 | + __u32 line_length; /* length of a line in bytes */ | |
33 | + unsigned long mmio_start; /* Start of Memory Mapped I/O */ | |
34 | 34 | /* (physical address) */ |
35 | - __u32 mmio_len; /* Length of Memory Mapped I/O */ | |
35 | + __u32 mmio_len; /* Length of Memory Mapped I/O */ | |
36 | 36 | __u32 accel; /* Indicate to driver which */ |
37 | 37 | /* specific chip/card we have */ |
38 | 38 | __u16 reserved[3]; /* Reserved for future compatibility */ |
... | ... | @@ -56,7 +56,7 @@ |
56 | 56 | |
57 | 57 | }; |
58 | 58 | |
59 | -#define FB_NONSTD_HAM 1 /* Hold-And-Modify (HAM) */ | |
59 | +#define FB_NONSTD_HAM 1 /* Hold-And-Modify (HAM) */ | |
60 | 60 | #define FB_NONSTD_REV_PIX_IN_B 2 /* order of pixels in each byte is reversed */ |
61 | 61 | |
62 | 62 | #define FB_ACTIVATE_NOW 0 /* set values immediately (or vbl)*/ |
63 | 63 | |
64 | 64 | |
65 | 65 | |
66 | 66 | |
67 | 67 | |
... | ... | @@ -64,38 +64,38 @@ |
64 | 64 | #define FB_ACTIVATE_TEST 2 /* don't set, round up impossible */ |
65 | 65 | #define FB_ACTIVATE_MASK 15 |
66 | 66 | /* values */ |
67 | -#define FB_ACTIVATE_VBL 16 /* activate values on next vbl */ | |
67 | +#define FB_ACTIVATE_VBL 16 /* activate values on next vbl */ | |
68 | 68 | #define FB_CHANGE_CMAP_VBL 32 /* change colormap on vbl */ |
69 | 69 | #define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */ |
70 | 70 | #define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/ |
71 | -#define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */ | |
71 | +#define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */ | |
72 | 72 | |
73 | 73 | #define FB_SYNC_HOR_HIGH_ACT 1 /* horizontal sync high active */ |
74 | 74 | #define FB_SYNC_VERT_HIGH_ACT 2 /* vertical sync high active */ |
75 | 75 | #define FB_SYNC_EXT 4 /* external sync */ |
76 | -#define FB_SYNC_COMP_HIGH_ACT 8 /* composite sync high active */ | |
77 | -#define FB_SYNC_BROADCAST 16 /* broadcast video timings */ | |
76 | +#define FB_SYNC_COMP_HIGH_ACT 8 /* composite sync high active */ | |
77 | +#define FB_SYNC_BROADCAST 16 /* broadcast video timings */ | |
78 | 78 | /* vtotal = 144d/288n/576i => PAL */ |
79 | 79 | /* vtotal = 121d/242n/484i => NTSC */ |
80 | 80 | #define FB_SYNC_ON_GREEN 32 /* sync on green */ |
81 | 81 | |
82 | -#define FB_VMODE_NONINTERLACED 0 /* non interlaced */ | |
82 | +#define FB_VMODE_NONINTERLACED 0 /* non interlaced */ | |
83 | 83 | #define FB_VMODE_INTERLACED 1 /* interlaced */ |
84 | 84 | #define FB_VMODE_DOUBLE 2 /* double scan */ |
85 | 85 | #define FB_VMODE_ODD_FLD_FIRST 4 /* interlaced: top line first */ |
86 | 86 | #define FB_VMODE_MASK 255 |
87 | 87 | |
88 | -#define FB_VMODE_YWRAP 256 /* ywrap instead of panning */ | |
88 | +#define FB_VMODE_YWRAP 256 /* ywrap instead of panning */ | |
89 | 89 | #define FB_VMODE_SMOOTH_XPAN 512 /* smooth xpan possible (internally used) */ |
90 | 90 | #define FB_VMODE_CONUPDATE 512 /* don't update x/yoffset */ |
91 | 91 | |
92 | 92 | /* |
93 | 93 | * Display rotation support |
94 | 94 | */ |
95 | -#define FB_ROTATE_UR 0 | |
96 | -#define FB_ROTATE_CW 1 | |
97 | -#define FB_ROTATE_UD 2 | |
98 | -#define FB_ROTATE_CCW 3 | |
95 | +#define FB_ROTATE_UR 0 | |
96 | +#define FB_ROTATE_CW 1 | |
97 | +#define FB_ROTATE_UD 2 | |
98 | +#define FB_ROTATE_CCW 3 | |
99 | 99 | |
100 | 100 | #define PICOS2KHZ(a) (1000000000UL/(a)) |
101 | 101 | #define KHZ2PICOS(a) (1000000000UL/(a)) |
... | ... | @@ -154,10 +154,10 @@ |
154 | 154 | }; |
155 | 155 | |
156 | 156 | /* VESA Blanking Levels */ |
157 | -#define VESA_NO_BLANKING 0 | |
158 | -#define VESA_VSYNC_SUSPEND 1 | |
159 | -#define VESA_HSYNC_SUSPEND 2 | |
160 | -#define VESA_POWERDOWN 3 | |
157 | +#define VESA_NO_BLANKING 0 | |
158 | +#define VESA_VSYNC_SUSPEND 1 | |
159 | +#define VESA_HSYNC_SUSPEND 2 | |
160 | +#define VESA_POWERDOWN 3 | |
161 | 161 | |
162 | 162 | |
163 | 163 | enum { |
164 | 164 | |
... | ... | @@ -234,12 +234,12 @@ |
234 | 234 | */ |
235 | 235 | |
236 | 236 | #define FB_CUR_SETIMAGE 0x01 |
237 | -#define FB_CUR_SETPOS 0x02 | |
238 | -#define FB_CUR_SETHOT 0x04 | |
239 | -#define FB_CUR_SETCMAP 0x08 | |
237 | +#define FB_CUR_SETPOS 0x02 | |
238 | +#define FB_CUR_SETHOT 0x04 | |
239 | +#define FB_CUR_SETCMAP 0x08 | |
240 | 240 | #define FB_CUR_SETSHAPE 0x10 |
241 | 241 | #define FB_CUR_SETSIZE 0x20 |
242 | -#define FB_CUR_SETALL 0xFF | |
242 | +#define FB_CUR_SETALL 0xFF | |
243 | 243 | |
244 | 244 | struct fbcurpos { |
245 | 245 | __u16 x, y; |
246 | 246 | |
247 | 247 | |
... | ... | @@ -377,29 +377,29 @@ |
377 | 377 | * if you own it |
378 | 378 | */ |
379 | 379 | #define FB_EVENT_RESUME 0x03 |
380 | -/* An entry from the modelist was removed */ | |
381 | -#define FB_EVENT_MODE_DELETE 0x04 | |
382 | -/* A driver registered itself */ | |
383 | -#define FB_EVENT_FB_REGISTERED 0x05 | |
384 | -/* A driver unregistered itself */ | |
385 | -#define FB_EVENT_FB_UNREGISTERED 0x06 | |
386 | -/* CONSOLE-SPECIFIC: get console to framebuffer mapping */ | |
387 | -#define FB_EVENT_GET_CONSOLE_MAP 0x07 | |
388 | -/* CONSOLE-SPECIFIC: set console to framebuffer mapping */ | |
389 | -#define FB_EVENT_SET_CONSOLE_MAP 0x08 | |
390 | -/* A hardware display blank change occured */ | |
391 | -#define FB_EVENT_BLANK 0x09 | |
392 | -/* Private modelist is to be replaced */ | |
393 | -#define FB_EVENT_NEW_MODELIST 0x0A | |
380 | +/* An entry from the modelist was removed */ | |
381 | +#define FB_EVENT_MODE_DELETE 0x04 | |
382 | +/* A driver registered itself */ | |
383 | +#define FB_EVENT_FB_REGISTERED 0x05 | |
384 | +/* A driver unregistered itself */ | |
385 | +#define FB_EVENT_FB_UNREGISTERED 0x06 | |
386 | +/* CONSOLE-SPECIFIC: get console to framebuffer mapping */ | |
387 | +#define FB_EVENT_GET_CONSOLE_MAP 0x07 | |
388 | +/* CONSOLE-SPECIFIC: set console to framebuffer mapping */ | |
389 | +#define FB_EVENT_SET_CONSOLE_MAP 0x08 | |
390 | +/* A hardware display blank change occured */ | |
391 | +#define FB_EVENT_BLANK 0x09 | |
392 | +/* Private modelist is to be replaced */ | |
393 | +#define FB_EVENT_NEW_MODELIST 0x0A | |
394 | 394 | /* The resolution of the passed in fb_info about to change and |
395 | - all vc's should be changed */ | |
395 | + all vc's should be changed */ | |
396 | 396 | #define FB_EVENT_MODE_CHANGE_ALL 0x0B |
397 | 397 | /* A software display blank change occured */ |
398 | -#define FB_EVENT_CONBLANK 0x0C | |
399 | -/* Get drawing requirements */ | |
400 | -#define FB_EVENT_GET_REQ 0x0D | |
401 | -/* Unbind from the console if possible */ | |
402 | -#define FB_EVENT_FB_UNBIND 0x0E | |
398 | +#define FB_EVENT_CONBLANK 0x0C | |
399 | +/* Get drawing requirements */ | |
400 | +#define FB_EVENT_GET_REQ 0x0D | |
401 | +/* Unbind from the console if possible */ | |
402 | +#define FB_EVENT_FB_UNBIND 0x0E | |
403 | 403 | |
404 | 404 | struct fb_event { |
405 | 405 | struct fb_info *info; |
... | ... | @@ -421,10 +421,10 @@ |
421 | 421 | * format the hardware needs. |
422 | 422 | */ |
423 | 423 | |
424 | -#define FB_PIXMAP_DEFAULT 1 /* used internally by fbcon */ | |
425 | -#define FB_PIXMAP_SYSTEM 2 /* memory is in system RAM */ | |
426 | -#define FB_PIXMAP_IO 4 /* memory is iomapped */ | |
427 | -#define FB_PIXMAP_SYNC 256 /* set if GPU can DMA */ | |
424 | +#define FB_PIXMAP_DEFAULT 1 /* used internally by fbcon */ | |
425 | +#define FB_PIXMAP_SYSTEM 2 /* memory is in system RAM */ | |
426 | +#define FB_PIXMAP_IO 4 /* memory is iomapped */ | |
427 | +#define FB_PIXMAP_SYNC 256 /* set if GPU can DMA */ | |
428 | 428 | |
429 | 429 | struct fb_pixmap { |
430 | 430 | u8 *addr; /* pointer to memory */ |
... | ... | @@ -434,10 +434,10 @@ |
434 | 434 | u32 scan_align; /* alignment per scanline */ |
435 | 435 | u32 access_align; /* alignment per read/write (bits) */ |
436 | 436 | u32 flags; /* see FB_PIXMAP_* */ |
437 | - u32 blit_x; /* supported bit block dimensions (1-32)*/ | |
438 | - u32 blit_y; /* Format: blit_x = 1 << (width - 1) */ | |
439 | - /* blit_y = 1 << (height - 1) */ | |
440 | - /* if 0, will be set to 0xffffffff (all)*/ | |
437 | + u32 blit_x; /* supported bit block dimensions (1-32)*/ | |
438 | + u32 blit_y; /* Format: blit_x = 1 << (width - 1) */ | |
439 | + /* blit_y = 1 << (height - 1) */ | |
440 | + /* if 0, will be set to 0xffffffff (all)*/ | |
441 | 441 | /* access methods */ |
442 | 442 | void (*writeio)(struct fb_info *info, void *dst, void *src, unsigned int size); |
443 | 443 | void (*readio) (struct fb_info *info, void *dst, void *src, unsigned int size); |
... | ... | @@ -488,7 +488,7 @@ |
488 | 488 | * meaning, it is set by the fb subsystem depending FOREIGN_ENDIAN flag |
489 | 489 | * and host endianness. Drivers should not use this flag. |
490 | 490 | */ |
491 | -#define FBINFO_BE_MATH 0x100000 | |
491 | +#define FBINFO_BE_MATH 0x100000 | |
492 | 492 | |
493 | 493 | struct fb_info { |
494 | 494 | int node; |
... | ... | @@ -499,7 +499,7 @@ |
499 | 499 | struct fb_pixmap pixmap; /* Image hardware mapper */ |
500 | 500 | struct fb_pixmap sprite; /* Cursor hardware mapper */ |
501 | 501 | struct fb_cmap cmap; /* Current cmap */ |
502 | - struct list_head modelist; /* mode list */ | |
502 | + struct list_head modelist; /* mode list */ | |
503 | 503 | struct fb_videomode *mode; /* current mode */ |
504 | 504 | |
505 | 505 | char *screen_base; /* Virtual address */ |
... | ... | @@ -508,7 +508,7 @@ |
508 | 508 | #define FBINFO_STATE_RUNNING 0 |
509 | 509 | #define FBINFO_STATE_SUSPENDED 1 |
510 | 510 | u32 state; /* Hardware state i.e suspend */ |
511 | - void *fbcon_par; /* fbcon use-only private area */ | |
511 | + void *fbcon_par; /* fbcon use-only private area */ | |
512 | 512 | /* From here on everything is device dependent */ |
513 | 513 | void *par; |
514 | 514 | }; |
515 | 515 | |
... | ... | @@ -518,14 +518,14 @@ |
518 | 518 | #define FBINFO_FLAG_MODULE FBINFO_MODULE |
519 | 519 | #define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT |
520 | 520 | |
521 | -// This will go away | |
521 | +/* This will go away */ | |
522 | 522 | #if defined(__sparc__) |
523 | 523 | |
524 | 524 | /* We map all of our framebuffers such that big-endian accesses |
525 | 525 | * are what we want, so the following is sufficient. |
526 | 526 | */ |
527 | 527 | |
528 | -// This will go away | |
528 | +/* This will go away */ | |
529 | 529 | #define fb_readb sbus_readb |
530 | 530 | #define fb_readw sbus_readw |
531 | 531 | #define fb_readl sbus_readl |
... | ... | @@ -562,7 +562,7 @@ |
562 | 562 | |
563 | 563 | #endif |
564 | 564 | |
565 | -#define FB_LEFT_POS(p, bpp) (fb_be_math(p) ? (32 - (bpp)) : 0) | |
565 | +#define FB_LEFT_POS(p, bpp) (fb_be_math(p) ? (32 - (bpp)) : 0) | |
566 | 566 | #define FB_SHIFT_HIGH(p, val, bits) (fb_be_math(p) ? (val) >> (bits) : \ |
567 | 567 | (val) << (bits)) |
568 | 568 | #define FB_SHIFT_LOW(p, val, bits) (fb_be_math(p) ? (val) << (bits) : \ |
... | ... | @@ -580,7 +580,7 @@ |
580 | 580 | #define FB_MODE_IS_VESA 4 |
581 | 581 | #define FB_MODE_IS_CALCULATED 8 |
582 | 582 | #define FB_MODE_IS_FIRST 16 |
583 | -#define FB_MODE_IS_FROM_VAR 32 | |
583 | +#define FB_MODE_IS_FROM_VAR 32 | |
584 | 584 | |
585 | 585 | |
586 | 586 | /* drivers/video/fbcmap.c */ |
include/linux/kbuild.h
include/linux/usb/cdc.h
... | ... | @@ -9,8 +9,6 @@ |
9 | 9 | * Remy Bohmer <linux@bohmer.net> |
10 | 10 | */ |
11 | 11 | |
12 | - | |
13 | - | |
14 | 12 | #define USB_CDC_SUBCLASS_ACM 0x02 |
15 | 13 | #define USB_CDC_SUBCLASS_ETHERNET 0x06 |
16 | 14 | #define USB_CDC_SUBCLASS_WHCM 0x08 |
... | ... | @@ -198,7 +196,6 @@ |
198 | 196 | #define USB_CDC_PACKET_TYPE_DIRECTED (1 << 2) |
199 | 197 | #define USB_CDC_PACKET_TYPE_BROADCAST (1 << 3) |
200 | 198 | #define USB_CDC_PACKET_TYPE_MULTICAST (1 << 4) /* filtered */ |
201 | - | |
202 | 199 | |
203 | 200 | /*-------------------------------------------------------------------------*/ |
204 | 201 |
lib/hashtable.c
... | ... | @@ -56,7 +56,7 @@ |
56 | 56 | |
57 | 57 | /* |
58 | 58 | * [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986 |
59 | - * [Knuth] The Art of Computer Programming, part 3 (6.4) | |
59 | + * [Knuth] The Art of Computer Programming, part 3 (6.4) | |
60 | 60 | */ |
61 | 61 | |
62 | 62 | /* |
... | ... | @@ -252,7 +252,7 @@ |
252 | 252 | |
253 | 253 | if (htab->table[idx].used) { |
254 | 254 | /* |
255 | - * Further action might be required according to the | |
255 | + * Further action might be required according to the | |
256 | 256 | * action value. |
257 | 257 | */ |
258 | 258 | unsigned hval2; |
... | ... | @@ -283,8 +283,8 @@ |
283 | 283 | |
284 | 284 | do { |
285 | 285 | /* |
286 | - * Because SIZE is prime this guarantees to | |
287 | - * step through all available indices. | |
286 | + * Because SIZE is prime this guarantees to | |
287 | + * step through all available indices. | |
288 | 288 | */ |
289 | 289 | if (idx <= hval2) |
290 | 290 | idx = htab->size + idx - hval2; |
... | ... | @@ -323,8 +323,8 @@ |
323 | 323 | /* An empty bucket has been found. */ |
324 | 324 | if (action == ENTER) { |
325 | 325 | /* |
326 | - * If table is full and another entry should be | |
327 | - * entered return with error. | |
326 | + * If table is full and another entry should be | |
327 | + * entered return with error. | |
328 | 328 | */ |
329 | 329 | if (htab->filled == htab->size) { |
330 | 330 | __set_errno(ENOMEM); |
lib/qsort.c