aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-03 17:48:43 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-12 12:43:55 +0200
commit43d3ef91f14ea2353cbc7b6d7271a496017c6bc2 (patch)
tree5888210e2dded4d0603ddbb5c4751794d7922e2d /target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
parent23d3fafd87f9040a9b90873d81ab52539470649e (diff)
downloadupstream-43d3ef91f14ea2353cbc7b6d7271a496017c6bc2.tar.gz
upstream-43d3ef91f14ea2353cbc7b6d7271a496017c6bc2.tar.bz2
upstream-43d3ef91f14ea2353cbc7b6d7271a496017c6bc2.zip
bcm63xx: prevent fall-through in kernel patches for 5.4
In kernel 5.4 -Werror=implicit-fallthrough is treated as error: arch/mips/bcm63xx/cpu.c: In function 'detect_cpu_clock': arch/mips/bcm63xx/cpu.c:158:2: error: this statement may fall through [-Werror=implicit-fallthrough=] { ^ arch/mips/bcm63xx/cpu.c:179:2: note: here case BCM6328_CPU_ID: ^~~~ cc1: all warnings being treated as errors This can be fixed by adding "Fall through" as a comment where intended, and has to be fixed by returning a proper default otherwise. In case of the default clock frequency for BCM6318 we fixed this by returning the default value taken from BCM6328 and BCM6362. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch')
-rw-r--r--target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
index c9d2ee1791..d83d2cec7b 100644
--- a/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
+++ b/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch
@@ -24,7 +24,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
obj-y += boards/
--- /dev/null
+++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
-@@ -0,0 +1,200 @@
+@@ -0,0 +1,201 @@
+/*
+ * Broadcom BCM63XX Ath9k EEPROM fixup helper.
+ *
@@ -108,6 +108,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
+ return eeprom;
+ }
+ /* can't do anything here without talking to the SPI controller. */
++ /* Fall through */
+ case BCM63XX_FLASH_TYPE_NAND:
+ default:
+ return NULL;