aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-11-12 18:51:38 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-11-12 18:51:38 +0000
commitf4d5c885e4acd0b3deaad0b25af67344645e3fba (patch)
treef46bf361976fed92a9511429e17eade7f69bcad7
parente244e1c7cd8757f0f4169518be508b6a012b7f98 (diff)
downloadupstream-f4d5c885e4acd0b3deaad0b25af67344645e3fba.tar.gz
upstream-f4d5c885e4acd0b3deaad0b25af67344645e3fba.tar.bz2
upstream-f4d5c885e4acd0b3deaad0b25af67344645e3fba.zip
ar71xx: return statements does not need parenthesis
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> SVN-Revision: 23979
-rw-r--r--target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c2
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h4
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c b/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c
index 7d0eee9dbf..c6c6e55834 100644
--- a/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c
+++ b/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c
@@ -107,7 +107,7 @@ int ar71xx_pci_be_handler(int is_fixup)
__raw_writel(ahb_err, base + PCI_REG_AHB_ERR);
}
- return ((ahb_err | pci_err) ? 1 : 0);
+ return (ahb_err | pci_err) ? 1 : 0;
}
static inline int ar71xx_pci_set_cfgaddr(struct pci_bus *bus,
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 42c07cd533..8a2913f219 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -190,12 +190,12 @@ static inline struct ag71xx_platform_data *ag71xx_get_pdata(struct ag71xx *ag)
static inline int ag71xx_desc_empty(struct ag71xx_desc *desc)
{
- return ((desc->ctrl & DESC_EMPTY) != 0);
+ return (desc->ctrl & DESC_EMPTY) != 0;
}
static inline int ag71xx_desc_pktlen(struct ag71xx_desc *desc)
{
- return (desc->ctrl & DESC_PKTLEN_M);
+ return desc->ctrl & DESC_PKTLEN_M;
}
/* Register offsets */
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
index c256d0584f..e8d85afa19 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
@@ -219,17 +219,17 @@ static inline void ar7240sw_init(struct ar7240sw *as, struct mii_bus *mii)
static inline u16 mk_phy_addr(u32 reg)
{
- return (0x17 & ((reg >> 4) | 0x10));
+ return 0x17 & ((reg >> 4) | 0x10);
}
static inline u16 mk_phy_reg(u32 reg)
{
- return ((reg << 1) & 0x1e);
+ return (reg << 1) & 0x1e;
}
static inline u16 mk_high_addr(u32 reg)
{
- return ((reg >> 7) & 0x1ff);
+ return (reg >> 7) & 0x1ff;
}
static u32 __ar7240sw_reg_read(struct ar7240sw *as, u32 reg)
@@ -249,7 +249,7 @@ static u32 __ar7240sw_reg_read(struct ar7240sw *as, u32 reg)
lo = (u32) mdiobus_read(mii, phy_addr, phy_reg);
hi = (u32) mdiobus_read(mii, phy_addr, phy_reg + 1);
- return ((hi << 16) | lo);
+ return (hi << 16) | lo;
}
static void __ar7240sw_reg_write(struct ar7240sw *as, u32 reg, u32 val)
@@ -352,7 +352,7 @@ static u16 ar7240sw_phy_read(struct ar7240sw *as, unsigned phy_addr,
return 0xffff;
t = ar7240sw_reg_read(as, AR7240_REG_MDIO_CTRL);
- return (t & AR7240_MDIO_CTRL_DATA_M);
+ return t & AR7240_MDIO_CTRL_DATA_M;
}
static int ar7240sw_phy_write(struct ar7240sw *as, unsigned phy_addr,