Skip to content

L
linux-davinci
Commit 10a9948d authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by David S. Miller
Browse files
Options

mv643xx_eth: checkpatch fixes 

Fix up a couple of coding style issues caught by checkpatch.
Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21d1a161
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 16 deletions
drivers/net/mv643xx_eth.c
View file @ 10a9948d
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <asm/io.h> #include <linux/io.h>
#include <asm/types.h> #include <linux/types.h>
#include <asm/system.h> #include <asm/system.h>
static char mv643xx_eth_driver_name[] = "mv643xx_eth"; static char mv643xx_eth_driver_name[] = "mv643xx_eth";
...@@ -138,14 +138,14 @@ static char mv643xx_eth_driver_version[] = "1.4"; ...@@ -138,14 +138,14 @@ static char mv643xx_eth_driver_version[] = "1.4";
#if defined(__BIG_ENDIAN) #if defined(__BIG_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \ #define PORT_SDMA_CONFIG_DEFAULT_VALUE \
RX_BURST_SIZE_16_64BIT | \ (RX_BURST_SIZE_16_64BIT | \
TX_BURST_SIZE_16_64BIT TX_BURST_SIZE_16_64BIT)
#elif defined(__LITTLE_ENDIAN) #elif defined(__LITTLE_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \ #define PORT_SDMA_CONFIG_DEFAULT_VALUE \
RX_BURST_SIZE_16_64BIT | \ (RX_BURST_SIZE_16_64BIT | \
BLM_RX_NO_SWAP | \ BLM_RX_NO_SWAP | \
BLM_TX_NO_SWAP | \ BLM_TX_NO_SWAP | \
TX_BURST_SIZE_16_64BIT TX_BURST_SIZE_16_64BIT)
#else #else
#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined #error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
#endif #endif
...@@ -1081,20 +1081,20 @@ static int smi_bus_read(struct mii_bus *bus, int addr, int reg) ...@@ -1081,20 +1081,20 @@ static int smi_bus_read(struct mii_bus *bus, int addr, int reg)
int ret; int ret;
if (smi_wait_ready(msp)) { if (smi_wait_ready(msp)) {
printk("mv643xx_eth: SMI bus busy timeout\n"); printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
writel(SMI_OPCODE_READ | (reg << 21) | (addr << 16), smi_reg); writel(SMI_OPCODE_READ | (reg << 21) | (addr << 16), smi_reg);
if (smi_wait_ready(msp)) { if (smi_wait_ready(msp)) {
printk("mv643xx_eth: SMI bus busy timeout\n"); printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
ret = readl(smi_reg); ret = readl(smi_reg);
if (!(ret & SMI_READ_VALID)) { if (!(ret & SMI_READ_VALID)) {
printk("mv643xx_eth: SMI bus read not valid\n"); printk(KERN_WARNING "mv643xx_eth: SMI bus read not valid\n");
return -ENODEV; return -ENODEV;
} }
...@@ -1107,7 +1107,7 @@ static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val) ...@@ -1107,7 +1107,7 @@ static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val)
void __iomem *smi_reg = msp->base + SMI_REG; void __iomem *smi_reg = msp->base + SMI_REG;
if (smi_wait_ready(msp)) { if (smi_wait_ready(msp)) {
printk("mv643xx_eth: SMI bus busy timeout\n"); printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -1115,7 +1115,7 @@ static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val) ...@@ -1115,7 +1115,7 @@ static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val)
(addr << 16) | (val & 0xffff), smi_reg); (addr << 16) | (val & 0xffff), smi_reg);
if (smi_wait_ready(msp)) { if (smi_wait_ready(msp)) {
printk("mv643xx_eth: SMI bus busy timeout\n"); printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -1268,7 +1268,8 @@ static const struct mv643xx_eth_stats mv643xx_eth_stats[] = { ...@@ -1268,7 +1268,8 @@ static const struct mv643xx_eth_stats mv643xx_eth_stats[] = {
MIBSTAT(late_collision), MIBSTAT(late_collision),
}; };
static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int
mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct mv643xx_eth_private *mp = netdev_priv(dev); struct mv643xx_eth_private *mp = netdev_priv(dev);
int err; int err;
...@@ -1286,7 +1287,9 @@ static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd * ...@@ -1286,7 +1287,9 @@ static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *
return err; return err;
} }
static int mv643xx_eth_get_settings_phyless(struct net_device *dev, struct ethtool_cmd *cmd) static int
mv643xx_eth_get_settings_phyless(struct net_device *dev,
struct ethtool_cmd *cmd)
{ {
struct mv643xx_eth_private *mp = netdev_priv(dev); struct mv643xx_eth_private *mp = netdev_priv(dev);
u32 port_status; u32 port_status;
...@@ -1320,7 +1323,8 @@ static int mv643xx_eth_get_settings_phyless(struct net_device *dev, struct ethto ...@@ -1320,7 +1323,8 @@ static int mv643xx_eth_get_settings_phyless(struct net_device *dev, struct ethto
return 0; return 0;
} }
static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int
mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct mv643xx_eth_private *mp = netdev_priv(dev); struct mv643xx_eth_private *mp = netdev_priv(dev);
...@@ -1332,7 +1336,9 @@ static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd * ...@@ -1332,7 +1336,9 @@ static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *
return phy_ethtool_sset(mp->phy, cmd); return phy_ethtool_sset(mp->phy, cmd);
} }
static int mv643xx_eth_set_settings_phyless(struct net_device *dev, struct ethtool_cmd *cmd) static int
mv643xx_eth_set_settings_phyless(struct net_device *dev,
struct ethtool_cmd *cmd)
{ {
return -EINVAL; return -EINVAL;
} }
...@@ -2336,7 +2342,7 @@ static void infer_hw_params(struct mv643xx_eth_shared_private *msp) ...@@ -2336,7 +2342,7 @@ static void infer_hw_params(struct mv643xx_eth_shared_private *msp)
static int mv643xx_eth_shared_probe(struct platform_device *pdev) static int mv643xx_eth_shared_probe(struct platform_device *pdev)
{ {
static int mv643xx_eth_version_printed = 0; static int mv643xx_eth_version_printed;
struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data; struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;
struct mv643xx_eth_shared_private *msp; struct mv643xx_eth_shared_private *msp;
struct resource *res; struct resource *res;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment