diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-10 09:05:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-10 09:05:40 +0000 |
| commit | 5bdef6a3578fc2a20a75a39f9cf6541f1d89d072 (patch) | |
| tree | 9eed2b72d99c0a7a8bafdd1dd53016e272a18968 /target/linux/atheros/patches-3.10/100-board.patch | |
| parent | 9206683f4bc211f1a962a7c174dc488081dff349 (diff) | |
| download | master-187ad058-5bdef6a3578fc2a20a75a39f9cf6541f1d89d072.tar.gz master-187ad058-5bdef6a3578fc2a20a75a39f9cf6541f1d89d072.tar.bz2 master-187ad058-5bdef6a3578fc2a20a75a39f9cf6541f1d89d072.zip | |
atheros: do not assignment in if condition
Remove assignments from if conditions as suggested by checkpatch.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41084 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.10/100-board.patch')
| -rw-r--r-- | target/linux/atheros/patches-3.10/100-board.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/atheros/patches-3.10/100-board.patch b/target/linux/atheros/patches-3.10/100-board.patch index 0bd3410e38..df7dcf6020 100644 --- a/target/linux/atheros/patches-3.10/100-board.patch +++ b/target/linux/atheros/patches-3.10/100-board.patch @@ -1524,7 +1524,7 @@ + --- /dev/null +++ b/arch/mips/ar231x/ar5312.c -@@ -0,0 +1,579 @@ +@@ -0,0 +1,580 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -1975,7 +1975,7 @@ +static int __init +ar5312_cpu_frequency(void) +{ -+ unsigned int result; ++ unsigned int scratch; + unsigned int predivide_mask, predivide_shift; + unsigned int multiplier_mask, multiplier_shift; + unsigned int clock_ctl1, predivide_select, predivisor, multiplier; @@ -1983,8 +1983,9 @@ + u16 devid; + + /* Trust the bootrom's idea of cpu frequency. */ -+ if ((result = ar231x_read_reg(AR5312_SCRATCH))) -+ return result; ++ scratch = ar231x_read_reg(AR5312_SCRATCH); ++ if (scratch) ++ return scratch; + + devid = ar231x_read_reg(AR531X_REV); + devid &= AR531X_REV_MAJ; |