diff options
author | Matteo Croce <rootkit85@yahoo.it> | 2007-09-12 16:15:12 +0000 |
---|---|---|
committer | Matteo Croce <rootkit85@yahoo.it> | 2007-09-12 16:15:12 +0000 |
commit | 64f9a226798a664fbcc67aaa4641f6a385607e53 (patch) | |
tree | 6f476c5c3c687d90a19146584eeccacada5da623 /target/linux/ar7/files | |
parent | 49bead58e6805614dbfe68d6e84e997666739f76 (diff) | |
download | upstream-64f9a226798a664fbcc67aaa4641f6a385607e53.tar.gz upstream-64f9a226798a664fbcc67aaa4641f6a385607e53.tar.bz2 upstream-64f9a226798a664fbcc67aaa4641f6a385607e53.zip |
Enabled working ar7_wdt, style cleanups
SVN-Revision: 8764
Diffstat (limited to 'target/linux/ar7/files')
-rw-r--r-- | target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c | 3 | ||||
-rw-r--r-- | target/linux/ar7/files/arch/mips/ar7/vlynq.c | 12 | ||||
-rw-r--r-- | target/linux/ar7/files/drivers/char/ar7_gpio.c | 8 | ||||
-rw-r--r-- | target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c | 10 | ||||
-rw-r--r-- | target/linux/ar7/files/drivers/leds/leds-ar7.c | 8 | ||||
-rw-r--r-- | target/linux/ar7/files/drivers/mtd/ar7part.c | 9 | ||||
-rw-r--r-- | target/linux/ar7/files/include/asm-mips/ar7/mmzone.h | 6 |
7 files changed, 31 insertions, 25 deletions
diff --git a/target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c b/target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c index ffcfa62a17..bffea51355 100644 --- a/target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c +++ b/target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c @@ -133,7 +133,8 @@ static inline u32 vlynq_get_mapped(struct vlynq_device *dev, int res) return ret; } -static inline u32 vlynq_read(u32 val, int size) { +static inline u32 vlynq_read(u32 val, int size) +{ switch (size) { case 1: return *(u8 *)&val; diff --git a/target/linux/ar7/files/arch/mips/ar7/vlynq.c b/target/linux/ar7/files/arch/mips/ar7/vlynq.c index 76dbd55ef4..3e852cd670 100644 --- a/target/linux/ar7/files/arch/mips/ar7/vlynq.c +++ b/target/linux/ar7/files/arch/mips/ar7/vlynq.c @@ -438,8 +438,10 @@ void vlynq_set_local_mapping(struct vlynq_device *dev, u32 tx_offset, vlynq_reg_write(dev->local->tx_offset, tx_offset); for (i = 0; i < 4; i++) { - vlynq_reg_write(dev->local->rx_mapping[i].offset, mapping[i].offset); - vlynq_reg_write(dev->local->rx_mapping[i].size, mapping[i].size); + vlynq_reg_write(dev->local->rx_mapping[i].offset, + mapping[i].offset); + vlynq_reg_write(dev->local->rx_mapping[i].size, + mapping[i].size); } } @@ -450,8 +452,10 @@ void vlynq_set_remote_mapping(struct vlynq_device *dev, u32 tx_offset, vlynq_reg_write(dev->remote->tx_offset, tx_offset); for (i = 0; i < 4; i++) { - vlynq_reg_write(dev->remote->rx_mapping[i].offset, mapping[i].offset); - vlynq_reg_write(dev->remote->rx_mapping[i].size, mapping[i].size); + vlynq_reg_write(dev->remote->rx_mapping[i].offset, + mapping[i].offset); + vlynq_reg_write(dev->remote->rx_mapping[i].size, + mapping[i].size); } } diff --git a/target/linux/ar7/files/drivers/char/ar7_gpio.c b/target/linux/ar7/files/drivers/char/ar7_gpio.c index c0ee897e22..d3cd7d96cc 100644 --- a/target/linux/ar7/files/drivers/char/ar7_gpio.c +++ b/target/linux/ar7/files/drivers/char/ar7_gpio.c @@ -1,18 +1,18 @@ /* * linux/drivers/char/ar7_gpio.c - * + * * Copyright (C) 2007 OpenWrt.org - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c index 889306188c..2acbd941d5 100644 --- a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c +++ b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c @@ -1,6 +1,6 @@ /* * linux/drivers/char/ar7_wdt.c - * + * * Copyright (C) 2007 OpenWrt.org * Copyright (c) 2005 Enrik Berkhan <Enrik.Berkhan@akk.org> * @@ -12,12 +12,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -55,8 +55,8 @@ static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); -#define READ_REG(x) readl((void __iomem*)&(x)) -#define WRITE_REG(x,v) writel((v), (void __iomem*)&(x)) +#define READ_REG(x) readl((void __iomem *)&(x)) +#define WRITE_REG(x, v) writel((v), (void __iomem *)&(x)) struct ar7_wdt { u32 kick_lock; diff --git a/target/linux/ar7/files/drivers/leds/leds-ar7.c b/target/linux/ar7/files/drivers/leds/leds-ar7.c index 809a4d4444..fb137c9221 100644 --- a/target/linux/ar7/files/drivers/leds/leds-ar7.c +++ b/target/linux/ar7/files/drivers/leds/leds-ar7.c @@ -1,18 +1,18 @@ /* * linux/drivers/leds/leds-ar7.c - * + * * Copyright (C) 2007 OpenWrt.org - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/target/linux/ar7/files/drivers/mtd/ar7part.c b/target/linux/ar7/files/drivers/mtd/ar7part.c index aa2508f90d..775041d7d6 100644 --- a/target/linux/ar7/files/drivers/mtd/ar7part.c +++ b/target/linux/ar7/files/drivers/mtd/ar7part.c @@ -1,16 +1,16 @@ /* * Copyright (C) 2007 Eugene Konev <ejka@openwrt.org> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -137,5 +137,6 @@ static int __init ar7_parser_init(void) module_init(ar7_parser_init); MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>, Eugene Konev <ejka@openwrt.org>"); +MODULE_AUTHOR( "Felix Fietkau <nbd@openwrt.org>, " + "Eugene Konev <ejka@openwrt.org>"); MODULE_DESCRIPTION("MTD partitioning for TI AR7"); diff --git a/target/linux/ar7/files/include/asm-mips/ar7/mmzone.h b/target/linux/ar7/files/include/asm-mips/ar7/mmzone.h index 59d9c712fe..8086593557 100644 --- a/target/linux/ar7/files/include/asm-mips/ar7/mmzone.h +++ b/target/linux/ar7/files/include/asm-mips/ar7/mmzone.h @@ -20,8 +20,8 @@ #define _ASM_MACH_MMZONE_H extern pg_data_t __node_data[]; -#define NODE_DATA(nid) (&__node_data[nid]) -#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map) -#define pa_to_nid(addr) (((addr) >= ARCH_PFN_OFFSET << PAGE_SHIFT) ? 0 : -1) +#define NODE_DATA(nid) (&__node_data[nid]) +#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map) +#define pa_to_nid(addr) (((addr) >= ARCH_PFN_OFFSET << PAGE_SHIFT) ? 0 : -1) #endif /* _ASM_MACH_MMZONE_H */ |