diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /Documentation/CodingStyle | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'Documentation/CodingStyle')
| -rw-r--r-- | Documentation/CodingStyle | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index 1cd3478e5834..58b0bf917834 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle | |||
| @@ -168,6 +168,13 @@ Do not unnecessarily use braces where a single statement will do. | |||
| 168 | if (condition) | 168 | if (condition) |
| 169 | action(); | 169 | action(); |
| 170 | 170 | ||
| 171 | and | ||
| 172 | |||
| 173 | if (condition) | ||
| 174 | do_this(); | ||
| 175 | else | ||
| 176 | do_that(); | ||
| 177 | |||
| 171 | This does not apply if one branch of a conditional statement is a single | 178 | This does not apply if one branch of a conditional statement is a single |
| 172 | statement. Use braces in both branches. | 179 | statement. Use braces in both branches. |
| 173 | 180 | ||