sky2: Code style fixes
Subsystems (2)
PATCH 1/1 sky2: Code style fixes
Fix selected style problems reported by checkpatch.
Signed-off-by Mike McCormack <[email protected]>
--- drivers/net/sky2.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/net/sky2.c +12 -12
@@ -79,7 +79,7 @@#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 =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)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 ; io_error:
@@ -1078,7 +1078,7 @@ static inline struct sky2_rx_le *sky2_next_rx(struct sky2_port *sky2)return le; } -static unsigned sky2_get_rx_threshold (struct sky2_port * sky2) +static unsigned sky2_get_rx_threshold (struct sky2_port *sky2) {unsigned size;
@@ -1089,7 +1089,7 @@ static unsigned sky2_get_rx_threshold(struct sky2_port* sky2)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;unsigned size;
@@ -1113,7 +1113,7 @@ static unsigned sky2_get_rx_data_size(struct sky2_port* sky2) }/* Build description to hardware for one receive segment */ -static void sky2_rx_add (struct sky2_port *sky2,u8 op, +static void sky2_rx_add (struct sky2_port *sky2,u8 op,dma_addr_t map,unsigned len) {struct sky2_rx_le *le;
@@ -3019,7 +3019,7 @@ static int __devinit sky2_init(struct sky2_hw *hw) hw->chip_id =sky2_read8 (hw,B2_CHIP_ID ); 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 : hw->flags =SKY2_HW_GIGABIT |SKY2_HW_NEWER_PHY ;if (hw->chip_rev <CHIP_REV_YU_XL_A2 )
@@ -3690,7 +3690,7 @@ static int sky2_set_mac_address(struct net_device *dev, void *p)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;
@@ -3916,7 +3916,7 @@ static int sky2_set_coalesce(struct net_device *dev,return -EINVAL ;if (ecmd->rx_max_coalesced_frames >RX_MAX_PENDING )return -EINVAL ; -if (ecmd->rx_max_coalesced_frames_irq >RX_MAX_PENDING ) +if (ecmd->rx_max_coalesced_frames_irq >RX_MAX_PENDING )return -EINVAL ;if (ecmd->tx_coalesce_usecs ==0 )
@@ -4381,7 +4381,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v)seq_printf (seq,"%u:" , idx); sop =0 ; -switch (le->opcode & ~HW_OWNER ) { +switch (le->opcode & ~HW_OWNER ) {case OP_ADDR64 :seq_printf (seq," %#x:" , a);break ;
@@ -4450,7 +4450,7 @@ static int sky2_device_event(struct notifier_block *unused,if (dev->netdev_ops->ndo_open != sky2_up || !sky2_debug)return NOTIFY_DONE ; -switch (event) { +switch (event) {case NETDEV_CHANGENAME :if (sky2->debugfs) { sky2->debugfs = debugfs_rename(sky2_debug, sky2->debugfs,
@@ -4645,7 +4645,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)struct pci_dev *pdev = hw->pdev;int err; -init_waitqueue_head (&hw->msi_wait); +init_waitqueue_head (&hw->msi_wait);sky2_write32 (hw,B0_IMSK ,Y2_IS_IRQ_SW );
@@ -4762,7 +4762,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,* this driver uses software swapping. */ 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) {dev_err (&pdev->dev,"PCI write config failed\n" ); goto err_out_free_regions;
Signature · 1 line
1.5.6.5
Quoted 3 lines · On Thu, 29 Jul 2010 22:34:52 +0900 Mike McCormack <[email protected]> wrote:
Fix selected style problems reported by checkpatch.
Signed-off-by Mike McCormack <[email protected]>
From: Stephen Hemminger <[email protected]>
Date: Thu, 29 Jul 2010 10:27:30 -0700
Quoted 8 lines
Quoted 3 lines · On Thu, 29 Jul 2010 22:34:52 +0900 Mike McCormack <[email protected]> wrote:
Fix selected style problems reported by checkpatch.
Signed-off-by Mike McCormack <[email protected]>
Applied.