diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 02:59:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 02:59:04 +0000 |
| commit | 60a15500fc5c9a7b3e839b2b96078cdb6bea38cd (patch) | |
| tree | 5992f8a4bf14650321b6fb6f9888e7177a92de9d /target/linux/atheros/patches-3.18/103-ar2315_gpio.patch | |
| parent | 96bfba8286568804498978209a3c930656b9bf90 (diff) | |
| download | master-187ad058-60a15500fc5c9a7b3e839b2b96078cdb6bea38cd.tar.gz master-187ad058-60a15500fc5c9a7b3e839b2b96078cdb6bea38cd.tar.bz2 master-187ad058-60a15500fc5c9a7b3e839b2b96078cdb6bea38cd.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44713 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 4 |
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; |