summaryrefslogtreecommitdiff
path: root/target/linux/atheros/patches-3.10/100-board.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-10 09:05:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-10 09:05:40 +0000
commit3406e402ef24a3b1fc736ca1a4b0fd99259e61a9 (patch)
tree65a92a499513c41f6eae7a2952a01a0dc00ac5c7 /target/linux/atheros/patches-3.10/100-board.patch
parent5427e47e59272c7e11554b1c654a997173c7f941 (diff)
downloadmtk-20170518-3406e402ef24a3b1fc736ca1a4b0fd99259e61a9.zip
mtk-20170518-3406e402ef24a3b1fc736ca1a4b0fd99259e61a9.tar.gz
mtk-20170518-3406e402ef24a3b1fc736ca1a4b0fd99259e61a9.tar.bz2
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> SVN-Revision: 41084
Diffstat (limited to 'target/linux/atheros/patches-3.10/100-board.patch')
-rw-r--r--target/linux/atheros/patches-3.10/100-board.patch9
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 0bd3410..df7dcf6 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;