aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-13 02:59:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-13 02:59:04 +0000
commit2f1ff48ea3dd36424aee989f53104d98a553954b (patch)
tree2d43d512c5c8c241b64dbb62068830887f0a609d /target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
parent8a98d187d5660c9fc397e9966435a5835eb0d54c (diff)
downloadupstream-2f1ff48ea3dd36424aee989f53104d98a553954b.tar.gz
upstream-2f1ff48ea3dd36424aee989f53104d98a553954b.tar.bz2
upstream-2f1ff48ea3dd36424aee989f53104d98a553954b.zip
atheros: v3.18: change calls logic
Check SoC family (AR5312+ or AR2315+) before call instead of checking it inside the called function. Also convert ar{5312,2315}_init_device() function to void, since they both return zero and nobody care about return value. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 44713
Diffstat (limited to 'target/linux/atheros/patches-3.18/103-ar2315_gpio.patch')
-rw-r--r--target/linux/atheros/patches-3.18/103-ar2315_gpio.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
index 532f37655b..5c72ee1fbf 100644
--- a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
+++ b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
@@ -8,7 +8,7 @@
default y
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
-@@ -207,6 +207,34 @@ static struct platform_device ar2315_wdt
+@@ -204,6 +204,34 @@ static struct platform_device ar2315_wdt
.num_resources = ARRAY_SIZE(ar2315_wdt_res)
};
@@ -43,7 +43,7 @@
/*
* NB: We use mapping size that is larger than the actual flash size,
* but this shouldn't be a problem here, because the flash will simply
-@@ -270,6 +298,7 @@ int __init ar2315_init_devices(void)
+@@ -264,6 +292,7 @@ void __init ar2315_init_devices(void)
ath25_find_config(ar2315_flash_limit());
ar2315_eth_data.macaddr = ath25_board.config->enet0_mac;