Commit 060b946c authored by Mike McCormack's avatar Mike McCormack Committed by David S. Miller

sky2: Code style fixes

Fix selected style problems reported by checkpatch.
Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e994762f
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
#define SKY2_EEPROM_MAGIC 0x9955aabb #define SKY2_EEPROM_MAGIC 0x9955aabb
#define RING_NEXT(x,s) (((x)+1) & ((s)-1)) #define RING_NEXT(x, s) (((x)+1) & ((s)-1))
static const u32 default_msg = static const u32 default_msg =
NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK
...@@ -172,7 +172,7 @@ static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val) ...@@ -172,7 +172,7 @@ static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val)
udelay(10); udelay(10);
} }
dev_warn(&hw->pdev->dev,"%s: phy write timeout\n", hw->dev[port]->name); dev_warn(&hw->pdev->dev, "%s: phy write timeout\n", hw->dev[port]->name);
return -ETIMEDOUT; return -ETIMEDOUT;
io_error: io_error:
...@@ -1067,7 +1067,7 @@ static inline struct sky2_rx_le *sky2_next_rx(struct sky2_port *sky2) ...@@ -1067,7 +1067,7 @@ static inline struct sky2_rx_le *sky2_next_rx(struct sky2_port *sky2)
return le; return le;
} }
static unsigned sky2_get_rx_threshold(struct sky2_port* sky2) static unsigned sky2_get_rx_threshold(struct sky2_port *sky2)
{ {
unsigned size; unsigned size;
...@@ -1078,7 +1078,7 @@ static unsigned sky2_get_rx_threshold(struct sky2_port* sky2) ...@@ -1078,7 +1078,7 @@ static unsigned sky2_get_rx_threshold(struct sky2_port* sky2)
return (size - 8) / sizeof(u32); return (size - 8) / sizeof(u32);
} }
static unsigned sky2_get_rx_data_size(struct sky2_port* sky2) static unsigned sky2_get_rx_data_size(struct sky2_port *sky2)
{ {
struct rx_ring_info *re; struct rx_ring_info *re;
unsigned size; unsigned size;
...@@ -3014,7 +3014,7 @@ static int __devinit sky2_init(struct sky2_hw *hw) ...@@ -3014,7 +3014,7 @@ static int __devinit sky2_init(struct sky2_hw *hw)
hw->chip_id = sky2_read8(hw, B2_CHIP_ID); hw->chip_id = sky2_read8(hw, B2_CHIP_ID);
hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4; hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4;
switch(hw->chip_id) { switch (hw->chip_id) {
case CHIP_ID_YUKON_XL: case CHIP_ID_YUKON_XL:
hw->flags = SKY2_HW_GIGABIT | SKY2_HW_NEWER_PHY; hw->flags = SKY2_HW_GIGABIT | SKY2_HW_NEWER_PHY;
if (hw->chip_rev < CHIP_REV_YU_XL_A2) if (hw->chip_rev < CHIP_REV_YU_XL_A2)
...@@ -3685,7 +3685,7 @@ static int sky2_set_mac_address(struct net_device *dev, void *p) ...@@ -3685,7 +3685,7 @@ static int sky2_set_mac_address(struct net_device *dev, void *p)
return 0; return 0;
} }
static void inline sky2_add_filter(u8 filter[8], const u8 *addr) static inline void sky2_add_filter(u8 filter[8], const u8 *addr)
{ {
u32 bit; u32 bit;
...@@ -3911,7 +3911,7 @@ static int sky2_set_coalesce(struct net_device *dev, ...@@ -3911,7 +3911,7 @@ static int sky2_set_coalesce(struct net_device *dev,
return -EINVAL; return -EINVAL;
if (ecmd->rx_max_coalesced_frames > RX_MAX_PENDING) if (ecmd->rx_max_coalesced_frames > RX_MAX_PENDING)
return -EINVAL; return -EINVAL;
if (ecmd->rx_max_coalesced_frames_irq >RX_MAX_PENDING) if (ecmd->rx_max_coalesced_frames_irq > RX_MAX_PENDING)
return -EINVAL; return -EINVAL;
if (ecmd->tx_coalesce_usecs == 0) if (ecmd->tx_coalesce_usecs == 0)
...@@ -4372,7 +4372,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v) ...@@ -4372,7 +4372,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v)
seq_printf(seq, "%u:", idx); seq_printf(seq, "%u:", idx);
sop = 0; sop = 0;
switch(le->opcode & ~HW_OWNER) { switch (le->opcode & ~HW_OWNER) {
case OP_ADDR64: case OP_ADDR64:
seq_printf(seq, " %#x:", a); seq_printf(seq, " %#x:", a);
break; break;
...@@ -4441,7 +4441,7 @@ static int sky2_device_event(struct notifier_block *unused, ...@@ -4441,7 +4441,7 @@ static int sky2_device_event(struct notifier_block *unused,
if (dev->netdev_ops->ndo_open != sky2_up || !sky2_debug) if (dev->netdev_ops->ndo_open != sky2_up || !sky2_debug)
return NOTIFY_DONE; return NOTIFY_DONE;
switch(event) { switch (event) {
case NETDEV_CHANGENAME: case NETDEV_CHANGENAME:
if (sky2->debugfs) { if (sky2->debugfs) {
sky2->debugfs = debugfs_rename(sky2_debug, sky2->debugfs, sky2->debugfs = debugfs_rename(sky2_debug, sky2->debugfs,
...@@ -4636,7 +4636,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw) ...@@ -4636,7 +4636,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
struct pci_dev *pdev = hw->pdev; struct pci_dev *pdev = hw->pdev;
int err; int err;
init_waitqueue_head (&hw->msi_wait); init_waitqueue_head(&hw->msi_wait);
sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW); sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
...@@ -4753,7 +4753,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, ...@@ -4753,7 +4753,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
* this driver uses software swapping. * this driver uses software swapping.
*/ */
reg &= ~PCI_REV_DESC; reg &= ~PCI_REV_DESC;
err = pci_write_config_dword(pdev,PCI_DEV_REG2, reg); err = pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
if (err) { if (err) {
dev_err(&pdev->dev, "PCI write config failed\n"); dev_err(&pdev->dev, "PCI write config failed\n");
goto err_out_free_regions; goto err_out_free_regions;
......
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