diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-12-09 21:07:33 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-12-12 10:22:19 +0100 |
commit | 8f23ec609c671d3012e38151f4646b5f6ed578ce (patch) | |
tree | 71d7bda7c619aac26c86d68f31510c5091344616 /target/linux/ar71xx/patches-4.4/504-MIPS-ath79-add-ath79_device_reset_get.patch | |
parent | a5923cd54987a83d56da3c8723f9a1c090254b2f (diff) | |
download | upstream-8f23ec609c671d3012e38151f4646b5f6ed578ce.tar.gz upstream-8f23ec609c671d3012e38151f4646b5f6ed578ce.tar.bz2 upstream-8f23ec609c671d3012e38151f4646b5f6ed578ce.zip |
ar71xx: remove obsolete flash chip locking code
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx/patches-4.4/504-MIPS-ath79-add-ath79_device_reset_get.patch')
-rw-r--r-- | target/linux/ar71xx/patches-4.4/504-MIPS-ath79-add-ath79_device_reset_get.patch | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/target/linux/ar71xx/patches-4.4/504-MIPS-ath79-add-ath79_device_reset_get.patch b/target/linux/ar71xx/patches-4.4/504-MIPS-ath79-add-ath79_device_reset_get.patch index 38d426e014..4f79136abe 100644 --- a/target/linux/ar71xx/patches-4.4/504-MIPS-ath79-add-ath79_device_reset_get.patch +++ b/target/linux/ar71xx/patches-4.4/504-MIPS-ath79-add-ath79_device_reset_get.patch @@ -1,19 +1,19 @@ --- a/arch/mips/include/asm/mach-ath79/ath79.h +++ b/arch/mips/include/asm/mach-ath79/ath79.h -@@ -144,6 +144,7 @@ static inline u32 ath79_reset_rr(unsigne +@@ -144,5 +144,6 @@ static inline u32 ath79_reset_rr(unsigne void ath79_device_reset_set(u32 mask); void ath79_device_reset_clear(u32 mask); +u32 ath79_device_reset_get(u32 mask); - void ath79_flash_acquire(void); - void ath79_flash_release(void); + #endif /* __ASM_MACH_ATH79_H */ --- a/arch/mips/ath79/common.c +++ b/arch/mips/ath79/common.c -@@ -144,6 +144,32 @@ void ath79_device_reset_clear(u32 mask) +@@ -142,3 +142,29 @@ void ath79_device_reset_clear(u32 mask) + spin_unlock_irqrestore(&ath79_device_reset_lock, flags); } EXPORT_SYMBOL_GPL(ath79_device_reset_clear); - ++ +u32 ath79_device_reset_get(u32 mask) +{ + unsigned long flags; @@ -39,7 +39,3 @@ + return ret; +} +EXPORT_SYMBOL_GPL(ath79_device_reset_get); -+ - void ath79_flash_acquire(void) - { - mutex_lock(&ath79_flash_mutex); |