drivers/net: Use netif_<level> macros
Subsystems (2)
cover drivers/net: Use netif_<level> macros
And a few checkpatch cleanups
Joe Perches (7):
drivers/net/ixgb: Use netif_printk macros drivers/net/sky2: Convert to use netif_printk macros drivers/net/tehuti.c: Use (pr|netdev|netif)_<levels> macro helpers drivers/net/tehuti.c: Hoist assigns out of ifs drivers/net/tehuti.c: trivial checkpatch cleanups drivers/net/pcnet32.c: Use (pr|netdev|netif)_<levels> macro helpers drivers/net/pcnet32.c: Checkpatch cleaning
drivers/net/ixgb/ixgb.h | 11 +- drivers/net/ixgb/ixgb_main.c | 89 ++++---- drivers/net/pcnet32.c | 500 +++++++++++++++++------------------------- drivers/net/sky2.c | 65 +++---- drivers/net/tehuti.c | 151 +++++++------- drivers/net/tehuti.h | 30 ++- 6 files changed, 374 insertions(+), 472 deletions(-)
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
PATCH 1/7 drivers/net/ixgb: Use netif_printk macros
Convert private DPRINTK macro uses to netif_<level> equivalents Remove #define DPRINTK
--- drivers/net/ixgb/ixgb.h | 11 +---- drivers/net/ixgb/ixgb_main.c | 89 ++++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 49 deletions(-)
drivers/net/ixgb/ixgb.h +3 -8
@@ -75,19 +75,14 @@ struct ixgb_adapter;#include "ixgb_ee.h" #include "ixgb_ids.h" +#define PFX "ixgb: " +#ifdef _DEBUG_DRIVER_ -#define IXGB_DBG(args...) printk(KERN_DEBUG "ixgb: " args) +#define IXGB_DBG(args...) printk(KERN_DEBUG PFX args)#else #define IXGB_DBG(args...)#endif -#define PFX "ixgb: " -#define DPRINTK(nlevel, klevel, fmt, args...) \ - (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ - printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ - __func__ , ## args)) - -/* TX/RX descriptor defines */ #define DEFAULT_TXD 256#define MAX_TXD 4096
drivers/net/ixgb/ixgb_main.c +48 -41
182 lines not on this page · raw message
Signature · 12 lines
1.7.0.14.g7e948 ------------------------------------------------------------------------------ SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev _______________________________________________ E1000-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/e1000-devel To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
PATCH 2/7 drivers/net/sky2: Convert to use netif_printk macros
In reply to Joe PerchesSome unlikely(netif_msg_<foo>(sky2)) tests are also removed by this change.
--- drivers/net/sky2.c | 65 +++++++++++++++++++++------------------------------ 1 files changed, 27 insertions(+), 38 deletions(-)
drivers/net/sky2.c +27 -38
@@ -1613,8 +1613,7 @@ static int sky2_up(struct net_device *dev)sky2_write32 (hw,B0_IMSK , imask);sky2_read32 (hw,B0_IMSK ); -if (netif_msg_ifup (sky2)) - printk(KERN_INFO PFX "%s: enabling interface\n", dev->name); +netif_info (sky2, ifup, dev,"enabling interface\n" );return 0 ;
@@ -1697,9 +1696,8 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb, goto mapping_error; slot = sky2->tx_prod; -if (unlikely (netif_msg_tx_queued (sky2))) -printk (KERN_DEBUG "%s: tx queued, slot %u, len %d\n" , - dev->name, slot, skb->len); +netif_printk (sky2, tx_queued,KERN_DEBUG , dev, +"tx queued, slot %u, len %d\n" , slot, skb->len);/* Send high bits if needed */ upper =upper_32_bits (mapping);
@@ -1864,9 +1862,8 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)sky2_tx_unmap (sky2->hw->pdev, re);if (skb) { -if (unlikely (netif_msg_tx_done (sky2))) -printk (KERN_DEBUG "%s: tx done %u\n" , - dev->name, idx); +netif_printk (sky2, tx_done,KERN_DEBUG , dev, +"tx done %u\n" , idx); dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len;
@@ -1961,8 +1958,7 @@ static int sky2_down(struct net_device *dev)if (!sky2->tx_le)return 0 ; -if (netif_msg_ifdown (sky2)) - printk(KERN_INFO PFX "%s: disabling interface\n", dev->name); +netif_info (sky2, ifdown, dev,"disabling interface\n" );/* Disable port IRQ */ sky2_write32(hw, B0_IMSK,
@@ -2028,12 +2024,11 @@ static void sky2_link_up(struct sky2_port *sky2)sky2_write8 (hw,SK_REG (port,LNK_LED_REG ),LINKLED_ON |LINKLED_BLINK_OFF |LINKLED_LINKSYNC_OFF ); -if (netif_msg_link (sky2)) - printk(KERN_INFO PFX -"%s: Link is up at %d Mbps, %s duplex, flow control %s\n" , - sky2->netdev->name, sky2->speed, - sky2->duplex ==DUPLEX_FULL ?"full" :"half" , - fc_name[sky2->flow_status]); +netif_info (sky2, link, sky2->netdev, +"Link is up at %d Mbps, %s duplex, flow control %s\n" , + sky2->speed, + sky2->duplex ==DUPLEX_FULL ?"full" :"half" , + fc_name[sky2->flow_status]); }static void sky2_link_down (struct sky2_port *sky2)
@@ -2053,8 +2048,7 @@ static void sky2_link_down(struct sky2_port *sky2)/* Turn off link LED */ sky2_write8 (hw,SK_REG (port,LNK_LED_REG ),LINKLED_OFF ); -if (netif_msg_link (sky2)) - printk(KERN_INFO PFX "%s: Link is down.\n", sky2->netdev->name); +netif_info (sky2, link, sky2->netdev,"Link is down\n" );sky2_phy_init (hw, port); }
@@ -2144,9 +2138,8 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port) istatus =gm_phy_read (hw, port,PHY_MARV_INT_STAT ); phystat =gm_phy_read (hw, port,PHY_MARV_PHY_STAT ); -if (netif_msg_intr (sky2)) - printk(KERN_INFO PFX "%s: phy interrupt status 0x%x 0x%x\n", - sky2->netdev->name, istatus, phystat); +netif_info (sky2, intr, sky2->netdev,"phy interrupt status 0x%x 0x%x\n" , + istatus, phystat);if (istatus &PHY_M_IS_AN_COMPL ) {if (sky2_autoneg_done (sky2, phystat) ==0 )
@@ -2200,8 +2193,7 @@ static void sky2_tx_timeout(struct net_device *dev)struct sky2_port *sky2 =netdev_priv (dev);struct sky2_hw *hw = sky2->hw; -if (netif_msg_timer (sky2)) - printk(KERN_ERR PFX "%s: tx timeout\n", dev->name); +netif_err (sky2, timer, dev,"tx timeout\n" ); printk(KERN_DEBUG PFX "%s: transmit ring %u .. %u report=%u done=%u\n", dev->name, sky2->tx_cons, sky2->tx_prod,
@@ -2396,9 +2388,9 @@ static struct sk_buff *sky2_receive(struct net_device *dev, count -=VLAN_HLEN ;#endif -if (unlikely (netif_msg_rx_status (sky2))) - printk(KERN_DEBUG PFX "%s: rx slot %u status 0x%x len %d\n", - dev->name, sky2->rx_next, status, length); +netif_printk (sky2, rx_status,KERN_DEBUG , dev, +"rx slot %u status 0x%x len %d\n" , + sky2->rx_next, status, length); sky2->rx_next = (sky2->rx_next +1 ) % sky2->rx_pending;prefetch (sky2->rx_ring + sky2->rx_next);
@@ -2439,9 +2431,10 @@ len_error:/* Truncation of overlength packets causes PHY length to not match MAC length */ ++dev->stats.rx_length_errors; -if (netif_msg_rx_err (sky2) &&net_ratelimit ()) -pr_info (PFX "%s: rx length error: status %#x length %d\n" , - dev->name, status, length); +if (net_ratelimit ()) +netif_info (sky2, rx_err, dev, +"rx length error: status %#x length %d\n" , + status, length); goto resubmit; error:
@@ -2451,9 +2444,9 @@ error: goto resubmit; } -if (netif_msg_rx_err (sky2) &&net_ratelimit ()) - printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n", - dev->name, status, length); +if (net_ratelimit ()) +netif_info (sky2, rx_err, dev, +"rx error, status 0x%x length %d\n" , status, length);if (status & (GMR_FS_LONG_ERR |GMR_FS_UN_SIZE )) dev->stats.rx_length_errors++;
@@ -2733,9 +2726,7 @@ static void sky2_mac_intr(struct sky2_hw *hw, unsigned port)struct sky2_port *sky2 =netdev_priv (dev);u8 status =sky2_read8 (hw,SK_REG (port,GMAC_IRQ_SRC )); -if (netif_msg_intr (sky2)) - printk(KERN_INFO PFX "%s: mac interrupt status 0x%x\n", - dev->name, status); +netif_info (sky2, intr, dev,"mac interrupt status 0x%x\n" , status);if (status &GM_IS_RX_CO_OV )gma_read16 (hw, port,GM_RX_IRQ_SRC );
@@ -4529,9 +4520,7 @@ static void __devinit sky2_show_addr(struct net_device *dev) {const struct sky2_port *sky2 =netdev_priv (dev); -if (netif_msg_probe (sky2)) - printk(KERN_INFO PFX "%s: addr %pM\n", - dev->name, dev->dev_addr); +netif_info (sky2, probe, dev,"addr %pM\n" , dev->dev_addr); }/* Handle software interrupt used during MSI test */
Signature · 1 line
1.7.0.14.g7e948
PATCH 3/7 drivers/net/tehuti.c: Use (pr|netdev|netif)_<levels> macro helpers
In reply to Joe PerchesMake the output logging messages a bit more consistent.
--- drivers/net/tehuti.c | 88 +++++++++++++++++++++++-------------------------- drivers/net/tehuti.h | 30 ++++++++++------- 2 files changed, 59 insertions(+), 59 deletions(-)
drivers/net/tehuti.c +41 -47
@@ -62,9 +62,11 @@* */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include "tehuti.h" -static DEFINE_PCI_DEVICE_TABLE (bdx_pci_tbl) = { +static struct pci_device_id __devinitdata bdx_pci_tbl[] = { {0x1FC9 ,0x3009 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0x1FC9 ,0x3010 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0x1FC9 ,0x3014 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },
@@ -105,26 +107,24 @@ static void print_hw_id(struct pci_dev *pdev)pci_read_config_word (pdev,PCI_LINK_STATUS_REG , &pci_link_status);pci_read_config_word (pdev,PCI_DEV_CTRL_REG , &pci_ctrl); -printk (KERN_INFO "tehuti: %s%s\n" ,BDX_NIC_NAME , - nic->port_num ==1 ?"" :", 2-Port" ); -printk (KERN_INFO -"tehuti: srom 0x%x fpga %d build %u lane# %d" -" max_pl 0x%x mrrs 0x%x\n" , -readl (nic->regs +SROM_VER ),readl (nic->regs +FPGA_VER ) &0xFFF , -readl (nic->regs +FPGA_SEED ), -GET_LINK_STATUS_LANES (pci_link_status), -GET_DEV_CTRL_MAXPL (pci_ctrl),GET_DEV_CTRL_MRRS (pci_ctrl)); +pr_info ("%s%s\n" ,BDX_NIC_NAME , + nic->port_num ==1 ?"" :", 2-Port" ); +pr_info ("srom 0x%x fpga %d build %u lane# %d max_pl 0x%x mrrs 0x%x\n" , +readl (nic->regs +SROM_VER ),readl (nic->regs +FPGA_VER ) &0xFFF , +readl (nic->regs +FPGA_SEED ), +GET_LINK_STATUS_LANES (pci_link_status), +GET_DEV_CTRL_MAXPL (pci_ctrl),GET_DEV_CTRL_MRRS (pci_ctrl)); }static void print_fw_id (struct pci_nic *nic) { -printk (KERN_INFO "tehuti: fw 0x%x\n" ,readl (nic->regs +FW_VER )); +pr_info ("fw 0x%x\n" ,readl (nic->regs +FW_VER )); }static void print_eth_id (struct net_device *ndev) { -printk (KERN_INFO "%s: %s, Port %c\n" , ndev->name,BDX_NIC_NAME , - (ndev->if_port ==0 ) ?'A' :'B' ); +netdev_info (ndev,"%s, Port %c\n" , +BDX_NIC_NAME , (ndev->if_port ==0 ) ?'A' :'B' ); }
@@ -160,7 +160,7 @@ bdx_fifo_init(struct bdx_priv *priv, struct fifo *f, int fsz_type, f->va =pci_alloc_consistent (priv->pdev, memsz +FIFO_EXTRA_SPACE , &f->da);if (!f->va) { -ERR ("pci_alloc_consistent failed\n" ); +pr_err ("pci_alloc_consistent failed\n" );RET (-ENOMEM ); } f->reg_CFG0 = reg_CFG0;
@@ -204,13 +204,13 @@ static void bdx_link_changed(struct bdx_priv *priv)if (netif_carrier_ok (priv->ndev)) {netif_stop_queue (priv->ndev);netif_carrier_off (priv->ndev); -ERR ("%s: Link Down\n" , priv->ndev->name); +netdev_err (priv->ndev,"Link Down\n" ); } }else {if (!netif_carrier_ok (priv->ndev)) {netif_wake_queue (priv->ndev);netif_carrier_on (priv->ndev); -ERR ("%s: Link Up\n" , priv->ndev->name); +netdev_err (priv->ndev,"Link Up\n" ); } } }
@@ -226,10 +226,10 @@ static void bdx_isr_extra(struct bdx_priv *priv, u32 isr)bdx_link_changed (priv);if (isr &IR_PCIE_LINK ) -ERR ("%s: PCI-E Link Fault\n" , priv->ndev->name); +netdev_err (priv->ndev,"PCI-E Link Fault\n" );if (isr &IR_PCIE_TOUT ) -ERR ("%s: PCI-E Time Out\n" , priv->ndev->name); +netdev_err (priv->ndev,"PCI-E Time Out\n" ); }
@@ -345,7 +345,7 @@ out:release_firmware (fw);if (rc) { -ERR ("%s: firmware loading failed\n" , priv->ndev->name); +netdev_err (priv->ndev,"firmware loading failed\n" );if (rc == -EIO ) DBG("VPC = 0x%x VIC = 0x%x INIT_STATUS = 0x%x i=%d\n", READ_REG(priv, regVPC),
@@ -462,7 +462,7 @@ static int bdx_hw_reset_direct(void __iomem *regs)readl (regs + regRXD_CFG0_0);return 0 ; } -ERR ("tehuti: HW reset failed\n" ); +pr_err ("HW reset failed\n" );return 1 ;/* failure */ }
@@ -486,7 +486,7 @@ static int bdx_hw_reset(struct bdx_priv *priv)READ_REG (priv, regRXD_CFG0_0);return 0 ; } -ERR ("tehuti: HW reset failed\n" ); +pr_err ("HW reset failed\n" );return 1 ;/* failure */ }
@@ -510,8 +510,7 @@ static int bdx_sw_reset(struct bdx_priv *priv)mdelay (10 ); }if (i ==50 ) -ERR ("%s: SW reset timeout. continuing anyway\n" , - priv->ndev->name); +netdev_err (priv->ndev,"SW reset timeout. continuing anyway\n" );/* 6. disable intrs */ WRITE_REG (priv, regRDINTCM0,0 );
@@ -647,7 +646,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)if (cmd !=SIOCDEVPRIVATE ) { error =copy_from_user (data, ifr->ifr_data,sizeof (data));if (error) { -ERR ("cant copy from user\n" ); +pr_err ("cant copy from user\n" );RET (error); }DBG ("%d 0x%x 0x%x\n" , data[0 ], data[1 ], data[2 ]);
@@ -708,7 +707,7 @@ static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)ENTER ;DBG2 ("vid=%d value=%d\n" , (int )vid, enable);if (unlikely (vid >=4096 )) { -ERR ("tehuti: invalid VID: %u (> 4096)\n" , vid); +pr_err ("invalid VID: %u (> 4096)\n" , vid);RET (); } reg = regVLAN_0 + (vid /32 ) *4 ;
@@ -776,8 +775,8 @@ static int bdx_change_mtu(struct net_device *ndev, int new_mtu)/* enforce minimum frame size */ if (new_mtu <ETH_ZLEN ) { -ERR ("%s: %s mtu %d is less then minimal %d\n" , -BDX_DRV_NAME , ndev->name, new_mtu,ETH_ZLEN ); +netdev_err (ndev,"mtu %d is less then minimal %d\n" , + new_mtu,ETH_ZLEN );RET (-EINVAL ); }
@@ -1038,7 +1037,7 @@ static int bdx_rx_init(struct bdx_priv *priv)return 0 ; err_mem: -ERR ("%s: %s: Rx init failed\n" ,BDX_DRV_NAME , priv->ndev->name); +netdev_err (priv->ndev,"Rx init failed\n" );return -ENOMEM ; }
@@ -1116,7 +1115,7 @@ static void bdx_rx_alloc_skbs(struct bdx_priv *priv, struct rxf_fifo *f) dno =bdx_rxdb_available (db) -1 ;while (dno >0 ) {if (!(skb =dev_alloc_skb (f->m.pktsz +NET_IP_ALIGN ))) { -ERR ("NO MEM: dev_alloc_skb failed\n" ); +pr_err ("NO MEM: dev_alloc_skb failed\n" );break ; } skb->dev = priv->ndev;
@@ -1337,9 +1336,7 @@ static int bdx_rx_receive(struct bdx_priv *priv, struct rxd_fifo *f, int budget)static void print_rxdd (struct rxd_desc *rxdd,u32 rxd_val1,u16 len,u16 rxd_vlan) { - DBG("ERROR: rxdd bc %d rxfq %d to %d type %d err %d rxp %d " - "pkt_id %d vtag %d len %d vlan_id %d cfi %d prio %d " - "va_lo %d va_hi %d\n", + DBG("ERROR: rxdd bc %d rxfq %d to %d type %d err %d rxp %d pkt_id %d vtag %d len %d vlan_id %d cfi %d prio %d va_lo %d va_hi %d\n", GET_RXD_BC(rxd_val1), GET_RXD_RXFQ(rxd_val1), GET_RXD_TO(rxd_val1), GET_RXD_TYPE(rxd_val1), GET_RXD_ERR(rxd_val1), GET_RXD_RXP(rxd_val1), GET_RXD_PKT_ID(rxd_val1),
@@ -1591,7 +1588,7 @@ static int bdx_tx_init(struct bdx_priv *priv)return 0 ; err_mem: -ERR ("tehuti: %s: Tx init failed\n" , priv->ndev->name); +netdev_err (priv->ndev,"Tx init failed\n" );return -ENOMEM ; }
@@ -1946,8 +1943,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) }else {if ((err =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ))) || (err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 )))) { -printk (KERN_ERR "tehuti: No usable DMA configuration" -", aborting\n" ); +pr_err ("No usable DMA configuration, aborting\n" ); goto err_dma; } pci_using_dac =0 ;
@@ -1961,25 +1957,25 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pciaddr =pci_resource_start (pdev,0 );if (!pciaddr) { err = -EIO ; -ERR ("tehuti: no MMIO resource\n" ); +pr_err ("no MMIO resource\n" ); goto err_out_res; }if ((regionSize =pci_resource_len (pdev,0 )) <BDX_REGS_SIZE ) { err = -EIO ; -ERR ("tehuti: MMIO resource (%x) too small\n" , regionSize); +pr_err ("MMIO resource (%x) too small\n" , regionSize); goto err_out_res; } nic->regs =ioremap (pciaddr, regionSize);if (!nic->regs) { err = -EIO ; -ERR ("tehuti: ioremap failed\n" ); +pr_err ("ioremap failed\n" ); goto err_out_res; }if (pdev->irq <2 ) { err = -EIO ; -ERR ("tehuti: invalid irq (%d)\n" , pdev->irq); +pr_err ("invalid irq (%d)\n" , pdev->irq); goto err_out_iomap; }pci_set_drvdata (pdev, nic);
@@ -1997,7 +1993,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)#ifdef BDX_MSI if ((readl (nic->regs +FPGA_VER ) &0xFFF ) >=378 ) {if ((err =pci_enable_msi (pdev))) -ERR ("Tehuti: Can't eneble msi. error is %d\n" , err); +pr_err ("Can't eneble msi. error is %d\n" , err);else nic->irq_type =IRQ_MSI ; }else
@@ -2008,7 +2004,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)for (port =0 ; port < nic->port_num; port++) {if (!(ndev =alloc_etherdev (sizeof (struct bdx_priv )))) { err = -ENOMEM ; -printk (KERN_ERR "tehuti: alloc_etherdev failed\n" ); +pr_err ("alloc_etherdev failed\n" ); goto err_out_iomap; }
@@ -2075,12 +2071,12 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/*bdx_hw_reset(priv); */ if (bdx_read_mac (priv)) { -printk (KERN_ERR "tehuti: load MAC address failed\n" ); +pr_err ("load MAC address failed\n" ); goto err_out_iomap; }SET_NETDEV_DEV (ndev, &pdev->dev);if ((err =register_netdev (ndev))) { -printk (KERN_ERR "tehuti: register_netdev failed\n" ); +pr_err ("register_netdev failed\n" ); goto err_out_free; }netif_carrier_off (ndev);
@@ -2493,10 +2489,8 @@ static struct pci_driver bdx_pci_driver = {*/ static void __init print_driver_id (void ) { -printk (KERN_INFO "%s: %s, %s\n" ,BDX_DRV_NAME ,BDX_DRV_DESC , -BDX_DRV_VERSION ); -printk (KERN_INFO "%s: Options: hw_csum %s\n" ,BDX_DRV_NAME , -BDX_MSI_STRING ); +pr_info ("%s, %s\n" ,BDX_DRV_DESC ,BDX_DRV_VERSION ); +pr_info ("Options: hw_csum %s\n" ,BDX_MSI_STRING ); }static int __init bdx_module_init (void )
drivers/net/tehuti.h +18 -12
@@ -529,28 +529,34 @@ struct txd_desc {/* Debugging Macros */ -#define ERR(fmt, args...) printk(KERN_ERR fmt, ## args) -#define DBG2(fmt, args...) \ - printk(KERN_ERR "%s:%-5d: " fmt, __func__, __LINE__, ## args) +#define DBG2(fmt, args...) \ + pr_err("%s:%-5d: " fmt, __func__, __LINE__, ## args)#define BDX_ASSERT (x) BUG_ON(x)#ifdef DEBUG -#define ENTER do { \ - printk(KERN_ERR "%s:%-5d: ENTER\n", __func__, __LINE__); \ +#define ENTER \ +do { \ + pr_err("%s:%-5d: ENTER\n", __func__, __LINE__); \ } while (0) -#define RET(args...) do { \ - printk(KERN_ERR "%s:%-5d: RETURN\n", __func__, __LINE__); \ -return args; } while (0) +#define RET(args...) \ +do { \ + pr_err("%s:%-5d: RETURN\n", __func__, __LINE__); \ + return args; \ +} while (0) -#define DBG(fmt, args...) \ - printk(KERN_ERR "%s:%-5d: " fmt, __func__, __LINE__, ## args) +#define DBG(fmt, args...) \ + pr_err("%s:%-5d: " fmt, __func__, __LINE__, ## args)#else -#define ENTER do { } while (0) +#define ENTER do { } while (0) #define RET(args...) return args -#define DBG(fmt, args...) do { } while (0) +#define DBG(fmt, args...) \ +do { \ + if (0) \ + pr_err(fmt, ##args); \ +} while (0)#endif #endif /* _BDX__H */
Signature · 1 line
1.7.0.14.g7e948
PATCH 4/7 drivers/net/tehuti.c: Hoist assigns out of ifs
In reply to Joe Perches--- drivers/net/tehuti.c | 49 +++++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 22 deletions(-)
drivers/net/tehuti.c +27 -22
@@ -420,8 +420,10 @@ static int bdx_hw_start(struct bdx_priv *priv) GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB);#define BDX_IRQ_TYPE ((priv->nic->irq_type == IRQ_MSI)?0:IRQF_SHARED) -if ((rc =request_irq (priv->pdev->irq, bdx_isr_napi,BDX_IRQ_TYPE , - ndev->name, ndev))) + + rc =request_irq (priv->pdev->irq, bdx_isr_napi,BDX_IRQ_TYPE , + ndev->name, ndev); +if (rc) goto err_irq;bdx_enable_interrupts (priv);
@@ -603,18 +605,15 @@ static int bdx_open(struct net_device *ndev)if (netif_running (ndev))netif_stop_queue (priv->ndev); -if ((rc =bdx_tx_init (priv))) - goto err; - -if ((rc =bdx_rx_init (priv))) - goto err; - -if ((rc =bdx_fw_load (priv))) +if ((rc =bdx_tx_init (priv)) || + (rc =bdx_rx_init (priv)) || + (rc =bdx_fw_load (priv))) goto err;bdx_rx_alloc_skbs (priv, &priv->rxf_fifo0); -if ((rc =bdx_hw_start (priv))) + rc =bdx_hw_start (priv); +if (rc) goto err;napi_enable (&priv->napi);
@@ -1027,10 +1026,9 @@ static int bdx_rx_init(struct bdx_priv *priv) regRXF_CFG0_0, regRXF_CFG1_0, regRXF_RPTR_0, regRXF_WPTR_0)) goto err_mem; -if (! - (priv->rxdb = -bdx_rxdb_create (priv->rxf_fifo0.m.memsz / -sizeof (struct rxf_desc )))) + priv->rxdb =bdx_rxdb_create (priv->rxf_fifo0.m.memsz / +sizeof (struct rxf_desc )); +if (!priv->rxdb) goto err_mem; priv->rxf_fifo0.m.pktsz = priv->ndev->mtu +VLAN_ETH_HLEN ;
@@ -1114,7 +1112,8 @@ static void bdx_rx_alloc_skbs(struct bdx_priv *priv, struct rxf_fifo *f)ENTER ; dno =bdx_rxdb_available (db) -1 ;while (dno >0 ) { -if (!(skb =dev_alloc_skb (f->m.pktsz +NET_IP_ALIGN ))) { + skb =dev_alloc_skb (f->m.pktsz +NET_IP_ALIGN ); +if (!skb) {pr_err ("NO MEM: dev_alloc_skb failed\n" );break ; }
@@ -1934,8 +1933,9 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)RET (-ENOMEM );/************** pci *****************/ -if ((err =pci_enable_device (pdev)))/* it trigers interrupt, dunno why. */ - goto err_pci;/* it's not a problem though */ + err =pci_enable_device (pdev); +if (err)/* it triggers interrupt, dunno why. */ + goto err_pci;/* it's not a problem though */ if (!(err =pci_set_dma_mask (pdev,DMA_BIT_MASK (64 ))) && !(err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )))) {
@@ -1949,7 +1949,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_using_dac =0 ; } -if ((err =pci_request_regions (pdev,BDX_DRV_NAME ))) + err =pci_request_regions (pdev,BDX_DRV_NAME ); +if (err) goto err_dma;pci_set_master (pdev);
@@ -1960,7 +1961,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pr_err ("no MMIO resource\n" ); goto err_out_res; } -if ((regionSize =pci_resource_len (pdev,0 )) <BDX_REGS_SIZE ) { + regionSize =pci_resource_len (pdev,0 ); +if (regionSize <BDX_REGS_SIZE ) { err = -EIO ;pr_err ("MMIO resource (%x) too small\n" , regionSize); goto err_out_res;
@@ -1992,7 +1994,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) nic->irq_type =IRQ_INTX ;#ifdef BDX_MSI if ((readl (nic->regs +FPGA_VER ) &0xFFF ) >=378 ) { -if ((err =pci_enable_msi (pdev))) + err =pci_enable_msi (pdev); +if (err)pr_err ("Can't eneble msi. error is %d\n" , err);else nic->irq_type =IRQ_MSI ;
@@ -2002,7 +2005,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/************** netdev **************/ for (port =0 ; port < nic->port_num; port++) { -if (!(ndev =alloc_etherdev (sizeof (struct bdx_priv )))) { + ndev =alloc_etherdev (sizeof (struct bdx_priv )); +if (!ndev) { err = -ENOMEM ;pr_err ("alloc_etherdev failed\n" ); goto err_out_iomap;
@@ -2075,7 +2079,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_iomap; }SET_NETDEV_DEV (ndev, &pdev->dev); -if ((err =register_netdev (ndev))) { + err =register_netdev (ndev); +if (err) {pr_err ("register_netdev failed\n" ); goto err_out_free; }
Signature · 1 line
1.7.0.14.g7e948
PATCH 5/7 drivers/net/tehuti.c: trivial checkpatch cleanups
In reply to Joe Perches--- drivers/net/tehuti.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/tehuti.c +7 -7
@@ -419,7 +419,7 @@ static int bdx_hw_start(struct bdx_priv *priv)WRITE_REG (priv, regGMAC_RXF_A,GMAC_RX_FILTER_OSEN |GMAC_RX_FILTER_AM |GMAC_RX_FILTER_AB ); -#define BDX_IRQ_TYPE ((priv->nic->irq_type == IRQ_MSI)?0:IRQF_SHARED) +#define BDX_IRQ_TYPE ((priv->nic->irq_type == IRQ_MSI) ? 0 : IRQF_SHARED) rc =request_irq (priv->pdev->irq, bdx_isr_napi,BDX_IRQ_TYPE , ndev->name, ndev);
@@ -1605,7 +1605,7 @@ static inline int bdx_tx_space(struct bdx_priv *priv) fsize = f->m.rptr - f->m.wptr;if (fsize <=0 ) fsize = f->m.memsz + fsize; -return (fsize); +return fsize; }/* bdx_tx_transmit - send packet to NIC
@@ -2295,13 +2295,13 @@ bdx_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal)/* Convert RX fifo size to number of pending packets */ static inline int bdx_rx_fifo_size_to_packets (int rx_size) { -return ((FIFO_SIZE * (1 << rx_size)) /sizeof (struct rxf_desc )); +return (FIFO_SIZE * (1 << rx_size)) /sizeof (struct rxf_desc ); }/* Convert TX fifo size to number of pending packets */ static inline int bdx_tx_fifo_size_to_packets (int tx_size) { -return ((FIFO_SIZE * (1 << tx_size)) /BDX_TXF_DESC_SZ ); +return (FIFO_SIZE * (1 << tx_size)) /BDX_TXF_DESC_SZ ; }/*
@@ -2393,10 +2393,10 @@ static int bdx_get_sset_count(struct net_device *netdev, int stringset)case ETH_SS_STATS :BDX_ASSERT (ARRAY_SIZE (bdx_stat_names) !=sizeof (struct bdx_stats ) /sizeof (u64)); -return ((priv->stats_flag) ?ARRAY_SIZE (bdx_stat_names) :0 ); -default : -return -EINVAL ; +return (priv->stats_flag) ?ARRAY_SIZE (bdx_stat_names) :0 ; } + +return -EINVAL ; }/*
Signature · 1 line
1.7.0.14.g7e948
PATCH 6/7 drivers/net/pcnet32.c: Use (pr|netdev|netif)_<levels> macro helpers
In reply to Joe PerchesMake the output logging messages a bit more consistent.
--- drivers/net/pcnet32.c | 347 ++++++++++++++++++------------------------------ 1 files changed, 130 insertions(+), 217 deletions(-)
drivers/net/pcnet32.c +130 -217
@@ -21,6 +21,8 @@* *************************************************************************/ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#define DRV_NAME "pcnet32"#define DRV_VERSION "1.35"#define DRV_RELDATE "21.Apr.2008"
@@ -487,10 +489,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, (1 << size), &new_ring_dma_addr);if (new_tx_ring ==NULL ) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Consistent memory allocation failed.\n" , - dev->name); +netif_err (lp, drv, dev,"Consistent memory allocation failed\n" );return ; }memset (new_tx_ring,0 ,sizeof (struct pcnet32_tx_head ) * (1 << size));
@@ -498,18 +497,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, new_dma_addr_list =kcalloc ((1 << size),sizeof (dma_addr_t),GFP_ATOMIC );if (!new_dma_addr_list) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Memory allocation failed.\n" , dev->name); +netif_err (lp, drv, dev,"Memory allocation failed\n" ); goto free_new_tx_ring; } new_skb_list =kcalloc ((1 << size),sizeof (struct sk_buff *),GFP_ATOMIC );if (!new_skb_list) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Memory allocation failed.\n" , dev->name); +netif_err (lp, drv, dev,"Memory allocation failed\n" ); goto free_new_lists; }
@@ -565,10 +560,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, (1 << size), &new_ring_dma_addr);if (new_rx_ring ==NULL ) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Consistent memory allocation failed.\n" , - dev->name); +netif_err (lp, drv, dev,"Consistent memory allocation failed\n" );return ; }memset (new_rx_ring,0 ,sizeof (struct pcnet32_rx_head ) * (1 << size));
@@ -576,18 +568,14 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, new_dma_addr_list =kcalloc ((1 << size),sizeof (dma_addr_t),GFP_ATOMIC );if (!new_dma_addr_list) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Memory allocation failed.\n" , dev->name); +netif_err (lp, drv, dev,"Memory allocation failed\n" ); goto free_new_rx_ring; } new_skb_list =kcalloc ((1 << size),sizeof (struct sk_buff *),GFP_ATOMIC );if (!new_skb_list) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Memory allocation failed.\n" , dev->name); +netif_err (lp, drv, dev,"Memory allocation failed\n" ); goto free_new_lists; }
@@ -604,10 +592,8 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, new_skb_list[new] =dev_alloc_skb (PKT_BUF_SKB );if (!(rx_skbuff = new_skb_list[new])) {/* keep the original lists and buffers */ -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: pcnet32_realloc_rx_ring dev_alloc_skb failed.\n" , - dev->name); +netif_err (lp, drv, dev,"%s dev_alloc_skb failed\n" , + __func__); goto free_all_new; }skb_reserve (rx_skbuff,NET_IP_ALIGN );
@@ -838,10 +824,8 @@ static int pcnet32_set_ringparam(struct net_device *dev,spin_unlock_irqrestore (&lp->lock, flags); -if (netif_msg_drv (lp)) -printk (KERN_INFO -"%s: Ring Param Settings: RX: %d, TX: %d\n" , dev->name, - lp->rx_ring_size, lp->tx_ring_size); +netif_info (lp, drv, dev,"Ring Param Settings: RX: %d, TX: %d\n" , + lp->rx_ring_size, lp->tx_ring_size);return 0 ; }
@@ -871,17 +855,15 @@ static void pcnet32_ethtool_test(struct net_device *dev,if (test->flags ==ETH_TEST_FL_OFFLINE ) { rc =pcnet32_loopback_test (dev, data);if (rc) { -if (netif_msg_hw (lp)) -printk (KERN_DEBUG "%s: Loopback test failed.\n" , - dev->name); +netif_printk (lp, hw,KERN_DEBUG , dev, +"Loopback test failed\n" ); test->flags |=ETH_TEST_FL_FAILED ; - }else if (netif_msg_hw (lp)) -printk (KERN_DEBUG "%s: Loopback test passed.\n" , - dev->name); - }else if (netif_msg_hw (lp)) -printk (KERN_DEBUG -"%s: No tests to run (specify 'Offline' on ethtool)." , - dev->name); + }else +netif_printk (lp, hw,KERN_DEBUG , dev, +"Loopback test passed\n" ); + }else +netif_printk (lp, hw,KERN_DEBUG , dev, +"No tests to run (specify 'Offline' on ethtool)\n" ); }/* end pcnet32_ethtool_test */ static int pcnet32_loopback_test (struct net_device *dev,uint64_t * data1)
@@ -927,10 +909,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) size = data_len +15 ;for (x =0 ; x < numbuffs; x++) {if (!(skb =dev_alloc_skb (size))) { -if (netif_msg_hw (lp)) -printk (KERN_DEBUG -"%s: Cannot allocate skb at line: %d!\n" , - dev->name, __LINE__); +netif_printk (lp, hw,KERN_DEBUG , dev, +"Cannot allocate skb at line: %d!\n" , + __LINE__); goto clean_up; }else { packet = skb->data;
@@ -984,9 +965,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) ticks++; }if (ticks ==200 ) { -if (netif_msg_hw (lp)) -printk ("%s: Desc %d failed to reset!\n" , - dev->name, x); +netif_err (lp, hw, dev,"Desc %d failed to reset!\n" , x);break ; } }
@@ -994,15 +973,15 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) lp->a.write_csr (ioaddr,CSR0 ,CSR0_STOP );/* Set STOP bit */ wmb ();if (netif_msg_hw (lp) &&netif_msg_pktdata (lp)) { -printk (KERN_DEBUG "%s: RX loopback packets:\n" , dev->name); +netdev_printk (KERN_DEBUG , dev,"RX loopback packets:\n" );for (x =0 ; x < numbuffs; x++) { -printk (KERN_DEBUG "%s: Packet %d:\n" , dev->name, x); +netdev_printk (KERN_DEBUG , dev,"Packet %d: " , x); skb = lp->rx_skbuff[x];for (i =0 ; i < size; i++) { -printk ("%02x " , *(skb->data + i)); +pr_cont (" %02x" , *(skb->data + i)); } -printk ("\n" ); +pr_cont ("\n" ); } }
@@ -1013,11 +992,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) packet = lp->tx_skbuff[x]->data;for (i =0 ; i < size; i++) {if (*(skb->data + i) != packet[i]) { -if (netif_msg_hw (lp)) -printk (KERN_DEBUG -"%s: Error in compare! %2x - %02x %02x\n" , - dev->name, i, *(skb->data + i), - packet[i]); +netif_printk (lp, hw,KERN_DEBUG , dev, +"Error in compare! %2x - %02x %02x\n" , + i, *(skb->data + i), packet[i]); rc =1 ;break ; }
@@ -1136,10 +1113,8 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,spin_lock_irqsave (&lp->lock, *flags); ticks++;if (ticks >200 ) { -if (netif_msg_hw (lp)) -printk (KERN_DEBUG -"%s: Error getting into suspend!\n" , - dev->name); +netif_printk (lp, hw,KERN_DEBUG , dev, +"Error getting into suspend!\n" );return 0 ; } }
@@ -1184,15 +1159,13 @@ static void pcnet32_rx_entry(struct net_device *dev,/* Discard oversize frames. */ if (unlikely (pkt_len >PKT_BUF_SIZE )) { -if (netif_msg_drv (lp)) -printk (KERN_ERR "%s: Impossible packet size %d!\n" , - dev->name, pkt_len); +netif_err (lp, drv, dev,"Impossible packet size %d!\n" , + pkt_len); dev->stats.rx_errors++;return ; }if (pkt_len <60 ) { -if (netif_msg_rx_err (lp)) -printk (KERN_ERR "%s: Runt packet!\n" , dev->name); +netif_err (lp, rx_err, dev,"Runt packet!\n" ); dev->stats.rx_errors++;return ; }
@@ -1223,10 +1196,7 @@ static void pcnet32_rx_entry(struct net_device *dev, }if (skb ==NULL ) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Memory squeeze, dropping packet.\n" , - dev->name); +netif_err (lp, drv, dev,"Memory squeeze, dropping packet\n" ); dev->stats.rx_dropped++;return ; }
@@ -1297,11 +1267,9 @@ static int pcnet32_tx(struct net_device *dev)/* There was a major error, log it. */ int err_status =le32_to_cpu (lp->tx_ring[entry].misc); dev->stats.tx_errors++; -if (netif_msg_tx_err (lp)) -printk (KERN_ERR -"%s: Tx error status=%04x err_status=%08x\n" , - dev->name, status, - err_status); +netif_err (lp, tx_err, dev, +"Tx error status=%04x err_status=%08x\n" , + status, err_status);if (err_status &0x04000000 ) dev->stats.tx_aborted_errors++;if (err_status &0x08000000 )
@@ -1313,10 +1281,7 @@ static int pcnet32_tx(struct net_device *dev) dev->stats.tx_fifo_errors++;/* Ackk! On FIFO errors the Tx unit is turned off! */ /* Remove this verbosity later! */ -if (netif_msg_tx_err (lp)) -printk (KERN_ERR -"%s: Tx FIFO error!\n" , - dev->name); +netif_err (lp, tx_err, dev,"Tx FIFO error!\n" ); must_restart = 1; }#else
@@ -1325,10 +1290,7 @@ static int pcnet32_tx(struct net_device *dev)if (!lp->dxsuflo) {/* If controller doesn't recover ... */ /* Ackk! On FIFO errors the Tx unit is turned off! */ /* Remove this verbosity later! */ -if (netif_msg_tx_err (lp)) -printk (KERN_ERR -"%s: Tx FIFO error!\n" , - dev->name); +netif_err (lp, tx_err, dev,"Tx FIFO error!\n" ); must_restart =1 ; } }
@@ -1354,11 +1316,8 @@ static int pcnet32_tx(struct net_device *dev) delta = (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask + lp->tx_ring_size);if (delta > lp->tx_ring_size) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: out-of-sync dirty pointer, %d vs. %d, full=%d.\n" , - dev->name, dirty_tx, lp->cur_tx, - lp->tx_full); +netif_err (lp, drv, dev,"out-of-sync dirty pointer, %d vs. %d, full=%d\n" , + dirty_tx, lp->cur_tx, lp->tx_full); dirty_tx += lp->tx_ring_size; delta -= lp->tx_ring_size; }
@@ -1535,8 +1494,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) err =pci_enable_device (pdev);if (err <0 ) {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_ERR PFX -"failed to enable device -- err=%d\n" , err); +pr_err ("failed to enable device -- err=%d\n" , err);return err; }pci_set_master (pdev);
@@ -1544,22 +1502,19 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) ioaddr =pci_resource_start (pdev,0 );if (!ioaddr) {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_ERR PFX -"card has no PCI IO resources, aborting\n" ); +pr_err ("card has no PCI IO resources, aborting\n" );return -ENODEV ; }if (!pci_dma_supported (pdev,PCNET32_DMA_MASK )) {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_ERR PFX -"architecture does not support 32bit PCI busmaster DMA\n" ); +pr_err ("architecture does not support 32bit PCI busmaster DMA\n" );return -ENODEV ; }if (request_region (ioaddr,PCNET32_TOTAL_SIZE ,"pcnet32_probe_pci" ) ==NULL ) {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_ERR PFX -"io address range already allocated\n" ); +pr_err ("io address range already allocated\n" );return -EBUSY ; }
@@ -1616,7 +1571,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) a = &pcnet32_dwio; }else {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_ERR PFX "No access methods\n"); +pr_err ("No access methods\n" ); goto err_release_region; } }
@@ -1624,11 +1579,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) chip_version = a->read_csr (ioaddr,88 ) | (a->read_csr (ioaddr,89 ) <<16 );if ((pcnet32_debug &NETIF_MSG_PROBE ) && (pcnet32_debug &NETIF_MSG_HW )) -printk (KERN_INFO " PCnet chip version is %#x.\n" , - chip_version); +pr_info (" PCnet chip version is %#x\n" , chip_version);if ((chip_version &0xfff ) !=0x003 ) {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_INFO PFX "Unsupported chip version.\n"); +pr_info ("Unsupported chip version\n" ); goto err_release_region; }
@@ -1681,7 +1635,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)if (cards_found <MAX_UNITS && homepna[cards_found]) media |=1 ;/* switch to home wiring mode */ if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_DEBUG PFX "media set to %sMbit mode.\n", + printk(KERN_DEBUG PFX "media set to %sMbit mode\n", (media &1 ) ?"1" :"10" ); a->write_bcr (ioaddr,49 , media);break ;
@@ -1697,9 +1651,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)break ;default :if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_INFO PFX -"PCnet version %#x, no PCnet32 chip.\n" , - chip_version); +pr_info ("PCnet version %#x, no PCnet32 chip\n" , + chip_version); goto err_release_region; }
@@ -1721,7 +1674,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) dev =alloc_etherdev (sizeof (*lp));if (!dev) {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_ERR PFX "Memory allocation failed.\n"); +pr_err ("Memory allocation failed\n" ); ret = -ENOMEM ; goto err_release_region; }
@@ -1730,7 +1683,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)SET_NETDEV_DEV (dev, &pdev->dev);if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_INFO PFX "%s at %#3lx,", chipname, ioaddr); +pr_info ("%s at %#3lx," , chipname, ioaddr);/* In most chips, after a chip reset, the ethernet address is read from the * station address PROM at the base address and programmed into the
@@ -1755,9 +1708,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) !is_valid_ether_addr(dev->dev_addr)) {if (is_valid_ether_addr (promaddr)) {if (pcnet32_debug &NETIF_MSG_PROBE ) { -printk (" warning: CSR address invalid,\n" ); -printk (KERN_INFO -" using instead PROM address of" ); +pr_cont (" warning: CSR address invalid,\n" ); +pr_info (" using instead PROM address of" ); }memcpy (dev->dev_addr, promaddr,6 ); }
@@ -1769,43 +1721,43 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)memset (dev->dev_addr,0 ,ETH_ALEN );if (pcnet32_debug &NETIF_MSG_PROBE ) { -printk (" %pM" , dev->dev_addr); +pr_cont (" %pM" , dev->dev_addr);/* Version 0x2623 and 0x2624 */ if (((chip_version +1 ) &0xfffe ) ==0x2624 ) { i = a->read_csr (ioaddr,80 ) &0x0C00 ;/* Check tx_start_pt */ -printk (KERN_INFO " tx_start_pt(0x%04x):" , i); +pr_info (" tx_start_pt(0x%04x):" , i);switch (i >>10 ) {case 0 : -printk (KERN_CONT " 20 bytes," ); +pr_cont (" 20 bytes," );break ;case 1 : -printk (KERN_CONT " 64 bytes," ); +pr_cont (" 64 bytes," );break ;case 2 : -printk (KERN_CONT " 128 bytes," ); +pr_cont (" 128 bytes," );break ;case 3 : -printk (KERN_CONT "~220 bytes," ); +pr_cont ("~220 bytes," );break ; } i = a->read_bcr (ioaddr,18 );/* Check Burst/Bus control */ -printk (KERN_CONT " BCR18(%x):" , i &0xffff ); +pr_cont (" BCR18(%x):" , i &0xffff );if (i & (1 <<5 )) -printk (KERN_CONT "BurstWrEn " ); +pr_cont ("BurstWrEn " );if (i & (1 <<6 )) -printk (KERN_CONT "BurstRdEn " ); +pr_cont ("BurstRdEn " );if (i & (1 <<7 )) -printk (KERN_CONT "DWordIO " ); +pr_cont ("DWordIO " );if (i & (1 <<11 )) -printk (KERN_CONT "NoUFlow " ); +pr_cont ("NoUFlow " ); i = a->read_bcr (ioaddr,25 ); -printk (KERN_INFO " SRAMSIZE=0x%04x," , i <<8 ); +pr_info (" SRAMSIZE=0x%04x," , i <<8 ); i = a->read_bcr (ioaddr,26 ); -printk (KERN_CONT " SRAM_BND=0x%04x," , i <<8 ); +pr_cont (" SRAM_BND=0x%04x," , i <<8 ); i = a->read_bcr (ioaddr,27 );if (i & (1 <<14 )) -printk (KERN_CONT "LowLatRx" ); +pr_cont ("LowLatRx" ); } }
@@ -1815,8 +1767,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)if ((lp->init_block =pci_alloc_consistent (pdev,sizeof (*lp->init_block), &lp->init_dma_addr)) ==NULL ) {if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_ERR PFX -"Consistent memory allocation failed.\n" ); +pr_err ("Consistent memory allocation failed\n" ); ret = -ENOMEM ; goto err_free_netdev; }
@@ -1890,7 +1841,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)if (pdev) {/* use the IRQ provided by PCI */ dev->irq = pdev->irq;if (pcnet32_debug &NETIF_MSG_PROBE ) -printk (" assigned IRQ %d.\n" , dev->irq); +pr_cont (" assigned IRQ %d\n" , dev->irq); }else {unsigned long irq_mask =probe_irq_on ();
@@ -1906,12 +1857,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) dev->irq =probe_irq_off (irq_mask);if (!dev->irq) {if (pcnet32_debug &NETIF_MSG_PROBE ) -printk (", failed to detect IRQ line.\n" ); +pr_cont (", failed to detect IRQ line\n" ); ret = -ENODEV ; goto err_free_ring; }if (pcnet32_debug &NETIF_MSG_PROBE ) -printk (", probed IRQ %d.\n" , dev->irq); +pr_cont (", probed IRQ %d\n" , dev->irq); }/* Set the mii phy_id so that we can query the link state */
@@ -1935,9 +1886,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) lp->phymask |= (1 << i); lp->mii_if.phy_id = i;if (pcnet32_debug &NETIF_MSG_PROBE ) - printk(KERN_INFO PFX -"Found PHY %04x:%04x at address %d.\n" , - id1, id2, i); +pr_info ("Found PHY %04x:%04x at address %d\n" , + id1, id2, i); } lp->a.write_bcr (ioaddr,33 , (lp->mii_if.phy_id) <<5 );if (lp->phycount >1 ) {
@@ -1966,7 +1916,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) }if (pcnet32_debug &NETIF_MSG_PROBE ) -printk (KERN_INFO "%s: registered as %s\n" , dev->name, lp->name); +pr_info ("%s: registered as %s\n" , dev->name, lp->name); cards_found++;/* enable LED writes */
@@ -1995,10 +1945,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name) lp->tx_ring_size, &lp->tx_ring_dma_addr);if (lp->tx_ring ==NULL ) { -if (netif_msg_drv (lp)) - printk(KERN_ERR PFX -"%s: Consistent memory allocation failed.\n" , - name); +netif_err (lp, drv, dev,"Consistent memory allocation failed\n" );return -ENOMEM ; }
@@ -2007,46 +1954,35 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name) lp->rx_ring_size, &lp->rx_ring_dma_addr);if (lp->rx_ring ==NULL ) { -if (netif_msg_drv (lp)) - printk(KERN_ERR PFX -"%s: Consistent memory allocation failed.\n" , - name); +netif_err (lp, drv, dev,"Consistent memory allocation failed\n" );return -ENOMEM ; } lp->tx_dma_addr =kcalloc (lp->tx_ring_size,sizeof (dma_addr_t),GFP_ATOMIC );if (!lp->tx_dma_addr) { -if (netif_msg_drv (lp)) - printk(KERN_ERR PFX -"%s: Memory allocation failed.\n" , name); +netif_err (lp, drv, dev,"Memory allocation failed\n" );return -ENOMEM ; } lp->rx_dma_addr =kcalloc (lp->rx_ring_size,sizeof (dma_addr_t),GFP_ATOMIC );if (!lp->rx_dma_addr) { -if (netif_msg_drv (lp)) - printk(KERN_ERR PFX -"%s: Memory allocation failed.\n" , name); +netif_err (lp, drv, dev,"Memory allocation failed\n" );return -ENOMEM ; } lp->tx_skbuff =kcalloc (lp->tx_ring_size,sizeof (struct sk_buff *),GFP_ATOMIC );if (!lp->tx_skbuff) { -if (netif_msg_drv (lp)) - printk(KERN_ERR PFX -"%s: Memory allocation failed.\n" , name); +netif_err (lp, drv, dev,"Memory allocation failed\n" );return -ENOMEM ; } lp->rx_skbuff =kcalloc (lp->rx_ring_size,sizeof (struct sk_buff *),GFP_ATOMIC );if (!lp->rx_skbuff) { -if (netif_msg_drv (lp)) - printk(KERN_ERR PFX -"%s: Memory allocation failed.\n" , name); +netif_err (lp, drv, dev,"Memory allocation failed\n" );return -ENOMEM ; }
@@ -2115,12 +2051,11 @@ static int pcnet32_open(struct net_device *dev)/* switch pcnet32 to 32bit mode */ lp->a.write_bcr (ioaddr,20 ,2 ); -if (netif_msg_ifup (lp)) -printk (KERN_DEBUG -"%s: pcnet32_open() irq %d tx/rx rings %#x/%#x init %#x.\n" , - dev->name, dev->irq, (u32) (lp->tx_ring_dma_addr), - (u32) (lp->rx_ring_dma_addr), - (u32) (lp->init_dma_addr)); +netif_printk (lp, ifup,KERN_DEBUG , dev, +"%s() irq %d tx/rx rings %#x/%#x init %#x\n" , + __func__, dev->irq, (u32) (lp->tx_ring_dma_addr), + (u32) (lp->rx_ring_dma_addr), + (u32) (lp->init_dma_addr));/* set/reset autoselect bit */ val = lp->a.read_bcr (ioaddr,2 ) & ~2 ;
@@ -2155,10 +2090,8 @@ static int pcnet32_open(struct net_device *dev) pdev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) {if (lp->options &PCNET32_PORT_ASEL ) { lp->options =PCNET32_PORT_FD |PCNET32_PORT_100 ; -if (netif_msg_link (lp)) -printk (KERN_DEBUG -"%s: Setting 100Mb-Full Duplex.\n" , - dev->name); +netif_printk (lp, link,KERN_DEBUG , dev, +"Setting 100Mb-Full Duplex\n" ); } }if (lp->phycount <2 ) {
@@ -2246,9 +2179,7 @@ static int pcnet32_open(struct net_device *dev) } } lp->mii_if.phy_id = first_phy; -if (netif_msg_link (lp)) -printk (KERN_INFO "%s: Using PHY number %d.\n" , - dev->name, first_phy); +netif_info (lp, link, dev,"Using PHY number %d\n" , first_phy); }#ifdef DO_DXSUFLO
@@ -2295,12 +2226,11 @@ static int pcnet32_open(struct net_device *dev)*/ lp->a.write_csr (ioaddr,CSR0 ,CSR0_NORMAL ); -if (netif_msg_ifup (lp)) -printk (KERN_DEBUG -"%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n" , - dev->name, i, - (u32) (lp->init_dma_addr), - lp->a.read_csr (ioaddr,CSR0 )); +netif_printk (lp, ifup,KERN_DEBUG , dev, +"pcnet32 open after %d ticks, init block %#x csr0 %4.4x\n" , + i, + (u32) (lp->init_dma_addr), + lp->a.read_csr (ioaddr,CSR0 ));spin_unlock_irqrestore (&lp->lock, flags);
@@ -2371,10 +2301,8 @@ static int pcnet32_init_ring(struct net_device *dev) (rx_skbuff = lp->rx_skbuff[i] = dev_alloc_skb(PKT_BUF_SKB))) {/* there is not much, we can do at this point */ -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: pcnet32_init_ring dev_alloc_skb failed.\n" , - dev->name); +netif_err (lp, drv, dev,"%s dev_alloc_skb failed\n" , + __func__);return -1 ; }skb_reserve (rx_skbuff,NET_IP_ALIGN );
@@ -2424,10 +2352,9 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)if (lp->a.read_csr (ioaddr,CSR0 ) &CSR0_STOP )break ; -if (i >=100 &&netif_msg_drv (lp)) -printk (KERN_ERR -"%s: pcnet32_restart timed out waiting for stop.\n" , - dev->name); +if (i >=100 ) +netif_err (lp, drv, dev,"%s timed out waiting for stop\n" , + __func__);pcnet32_purge_tx_ring (dev);if (pcnet32_init_ring (dev))
@@ -2451,8 +2378,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)spin_lock_irqsave (&lp->lock, flags);/* Transmitter timeout, serious problems. */ if (pcnet32_debug &NETIF_MSG_DRV ) -printk (KERN_ERR -"%s: transmit timed out, status %4.4x, resetting.\n" , +pr_err ("%s: transmit timed out, status %4.4x, resetting\n" , dev->name, lp->a.read_csr (ioaddr,CSR0 )); lp->a.write_csr (ioaddr,CSR0 ,CSR0_STOP ); dev->stats.tx_errors++;
@@ -2495,11 +2421,9 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,spin_lock_irqsave (&lp->lock, flags); -if (netif_msg_tx_queued (lp)) { -printk (KERN_DEBUG -"%s: pcnet32_start_xmit() called, csr0 %4.4x.\n" , - dev->name, lp->a.read_csr (ioaddr,CSR0 )); - } +netif_printk (lp, tx_queued,KERN_DEBUG , dev, +"%s() called, csr0 %4.4x\n" , + __func__, lp->a.read_csr (ioaddr,CSR0 ));/* Default status -- will not enable Successful-TxDone * interrupt when that option is available to us.
@@ -2564,10 +2488,9 @@ pcnet32_interrupt(int irq, void *dev_id)/* Acknowledge all of the current interrupt sources ASAP. */ lp->a.write_csr (ioaddr,CSR0 , csr0 & ~0x004f ); -if (netif_msg_intr (lp)) -printk (KERN_DEBUG -"%s: interrupt csr0=%#2.2x new csr=%#2.2x.\n" , - dev->name, csr0, lp->a.read_csr (ioaddr,CSR0 )); +netif_printk (lp, intr,KERN_DEBUG , dev, +"interrupt csr0=%#2.2x new csr=%#2.2x\n" , + csr0, lp->a.read_csr (ioaddr,CSR0 ));/* Log misc errors. */ if (csr0 &0x4000 )
@@ -2587,10 +2510,8 @@ pcnet32_interrupt(int irq, void *dev_id) dev->stats.rx_errors++;/* Missed a Rx frame. */ }if (csr0 &0x0800 ) { -if (netif_msg_drv (lp)) -printk (KERN_ERR -"%s: Bus master arbitration failure, status %4.4x.\n" , - dev->name, csr0); +netif_err (lp, drv, dev,"Bus master arbitration failure, status %4.4x\n" , + csr0);/* unlike for the lance, there is no restart needed */ }if (napi_schedule_prep (&lp->napi)) {
@@ -2606,9 +2527,9 @@ pcnet32_interrupt(int irq, void *dev_id) csr0 = lp->a.read_csr (ioaddr,CSR0 ); } -if (netif_msg_intr (lp)) -printk (KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n" , - dev->name, lp->a.read_csr (ioaddr,CSR0 )); +netif_printk (lp, intr,KERN_DEBUG , dev, +"exiting interrupt, csr0=%#4.4x\n" , + lp->a.read_csr (ioaddr,CSR0 ));spin_unlock (&lp->lock);
@@ -2630,10 +2551,9 @@ static int pcnet32_close(struct net_device *dev) dev->stats.rx_missed_errors = lp->a.read_csr (ioaddr,112 ); -if (netif_msg_ifdown (lp)) -printk (KERN_DEBUG -"%s: Shutting down ethercard, status was %2.2x.\n" , - dev->name, lp->a.read_csr (ioaddr,CSR0 )); +netif_printk (lp, ifdown,KERN_DEBUG , dev, +"Shutting down ethercard, status was %2.2x\n" , + lp->a.read_csr (ioaddr,CSR0 ));/* We stop the PCNET32 here -- it occasionally polls memory if we don't. */ lp->a.write_csr (ioaddr,CSR0 ,CSR0_STOP );
@@ -2730,9 +2650,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev) csr15 = lp->a.read_csr (ioaddr,CSR15 );if (dev->flags &IFF_PROMISC ) {/* Log any net taps. */ -if (netif_msg_hw (lp)) -printk (KERN_INFO "%s: Promiscuous mode enabled.\n" , - dev->name); +netif_info (lp, hw, dev,"Promiscuous mode enabled\n" ); lp->init_block->mode =cpu_to_le16 (0x8000 | (lp->options &PCNET32_PORT_PORTSEL ) <<7 );
@@ -2819,10 +2737,8 @@ static int pcnet32_check_otherphy(struct net_device *dev) mii.phy_id = i;if (mii_link_ok (&mii)) {/* found PHY with active link */ -if (netif_msg_link (lp)) -printk (KERN_INFO -"%s: Using PHY number %d.\n" , - dev->name, i); +netif_info (lp, link, dev,"Using PHY number %d\n" , + i);/* isolate inactive phy */ bmcr =
@@ -2868,8 +2784,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)if (!curr_link) {if (prev_link || verbose) {netif_carrier_off (dev); -if (netif_msg_link (lp)) -printk (KERN_INFO "%s: link down\n" , dev->name); +netif_info (lp, link, dev,"link down\n" ); }if (lp->phycount >1 ) { curr_link =pcnet32_check_otherphy (dev);
@@ -2881,12 +2796,11 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)if (netif_msg_link (lp)) {struct ethtool_cmd ecmd;mii_ethtool_gset (&lp->mii_if, &ecmd); -printk (KERN_INFO -"%s: link up, %sMbps, %s-duplex\n" , - dev->name, - (ecmd.speed ==SPEED_100 ) ?"100" :"10" , - (ecmd.duplex == -DUPLEX_FULL ) ?"full" :"half" ); +netdev_info (dev,"link up, %sMbps, %s-duplex\n" , + (ecmd.speed ==SPEED_100 ) + ?"100" :"10" , + (ecmd.duplex ==DUPLEX_FULL ) + ?"full" :"half" ); } bcr9 = lp->a.read_bcr (dev->base_addr,9 );if ((bcr9 & (1 <<0 )) != lp->mii_if.full_duplex) {
@@ -2897,8 +2811,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose) lp->a.write_bcr (dev->base_addr,9 , bcr9); } }else { -if (netif_msg_link (lp)) -printk (KERN_INFO "%s: link up\n" , dev->name); +netif_info (lp, link, dev,"link up\n" ); } } }
@@ -3010,7 +2923,7 @@ MODULE_LICENSE("GPL");static int __init pcnet32_init_module (void ) { -printk (KERN_INFO "%s" , version); +pr_info ("%s" , version); pcnet32_debug =netif_msg_init (debug,PCNET32_MSG_DEFAULT );
@@ -3026,7 +2939,7 @@ static int __init pcnet32_init_module(void)pcnet32_probe_vlbus (pcnet32_portlist);if (cards_found && (pcnet32_debug &NETIF_MSG_PROBE )) - printk(KERN_INFO PFX "%d cards_found.\n", cards_found); +pr_info ("%d cards_found\n" , cards_found);return (pcnet32_have_pci + cards_found) ?0 : -ENODEV ; }
Signature · 1 line
1.7.0.14.g7e948
PATCH 7/7 drivers/net/pcnet32.c: Checkpatch cleaning
In reply to Joe Perches--- drivers/net/pcnet32.c | 153 +++++++++++++++++++++++------------------------- 1 files changed, 73 insertions(+), 80 deletions(-)
drivers/net/pcnet32.c +73 -80
@@ -52,10 +52,10 @@ static const char *const version =#include <linux/spinlock.h> #include <linux/moduleparam.h> #include <linux/bitops.h> +#include <linux/io.h> +#include <linux/uaccess.h> #include <asm/dma.h> -#include <asm/io.h> -#include <asm/uaccess.h> #include <asm/irq.h> /*
@@ -85,7 +85,7 @@ static int cards_found;static unsigned int pcnet32_portlist[]__initdata = {0x300 ,0x320 ,0x340 ,0x360 ,0 }; -static int pcnet32_debug =0 ; +static int pcnet32_debug;static int tx_start =1 ;/* Mapping -- 0:20, 1:64, 2:128, 3:~220 (depends on chip vers) */ static int pcnet32vlb;/* check for VLB cards ? */
@@ -392,7 +392,7 @@ static struct pcnet32_access pcnet32_wio = {static u16 pcnet32_dwio_read_csr (unsigned long addr,int index) {outl (index, addr +PCNET32_DWIO_RAP ); -return (inl (addr +PCNET32_DWIO_RDP ) &0xffff ); +return inl (addr +PCNET32_DWIO_RDP ) &0xffff ; }static void pcnet32_dwio_write_csr (unsigned long addr,int index,u16 val)
@@ -404,7 +404,7 @@ static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)static u16 pcnet32_dwio_read_bcr (unsigned long addr,int index) {outl (index, addr +PCNET32_DWIO_RAP ); -return (inl (addr +PCNET32_DWIO_BDP ) &0xffff ); +return inl (addr +PCNET32_DWIO_BDP ) &0xffff ; }static void pcnet32_dwio_write_bcr (unsigned long addr,int index,u16 val)
@@ -415,7 +415,7 @@ static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)static u16 pcnet32_dwio_read_rap (unsigned long addr) { -return (inl (addr +PCNET32_DWIO_RAP ) &0xffff ); +return inl (addr +PCNET32_DWIO_RAP ) &0xffff ; }static void pcnet32_dwio_write_rap (unsigned long addr,u16 val)
@@ -524,15 +524,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, lp->tx_skbuff = new_skb_list;return ; - free_new_lists: +free_new_lists:kfree (new_dma_addr_list); - free_new_tx_ring: +free_new_tx_ring:pci_free_consistent (lp->pci_dev,sizeof (struct pcnet32_tx_head ) * (1 << size), new_tx_ring, new_ring_dma_addr); -return ; }/*
@@ -587,10 +586,11 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, new_skb_list[new] = lp->rx_skbuff[new]; }/* now allocate any new buffers needed */ -for (; new < size; new++ ) { +for (; new < size; new++) {struct sk_buff *rx_skbuff; new_skb_list[new] =dev_alloc_skb (PKT_BUF_SKB ); -if (!(rx_skbuff = new_skb_list[new])) { + rx_skbuff = new_skb_list[new]; +if (!rx_skbuff) {/* keep the original lists and buffers */ netif_err (lp, drv, dev,"%s dev_alloc_skb failed\n" , __func__);
@@ -630,8 +630,8 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, lp->rx_skbuff = new_skb_list;return ; - free_all_new: -for (; --new >= lp->rx_ring_size; ) { +free_all_new: +while (--new >= lp->rx_ring_size) {if (new_skb_list[new]) {pci_unmap_single (lp->pci_dev, new_dma_addr_list[new],PKT_BUF_SIZE ,PCI_DMA_FROMDEVICE );
@@ -639,9 +639,9 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, } }kfree (new_skb_list); - free_new_lists: +free_new_lists:kfree (new_dma_addr_list); - free_new_rx_ring: +free_new_rx_ring: pci_free_consistent(lp->pci_dev, sizeof(struct pcnet32_rx_head) * (1 << size),
@@ -831,7 +831,7 @@ static int pcnet32_set_ringparam(struct net_device *dev, }static void pcnet32_get_strings (struct net_device *dev,u32 stringset, -u8 * data) +u8 *data) {memcpy (data, pcnet32_gstrings_test,sizeof (pcnet32_gstrings_test)); }
@@ -908,39 +908,39 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)/* Initialize Transmit buffers. */ size = data_len +15 ;for (x =0 ; x < numbuffs; x++) { -if (!(skb =dev_alloc_skb (size))) { + skb =dev_alloc_skb (size); +if (!skb) {netif_printk (lp, hw,KERN_DEBUG , dev,"Cannot allocate skb at line: %d!\n" , __LINE__); goto clean_up; - }else { - packet = skb->data; -skb_put (skb, size);/* create space for data */ - lp->tx_skbuff[x] = skb; - lp->tx_ring[x].length =cpu_to_le16 (-skb->len); - lp->tx_ring[x].misc =0 ; - -/* put DA and SA into the skb */ -for (i =0 ; i <6 ; i++) - *packet++ = dev->dev_addr[i]; -for (i =0 ; i <6 ; i++) - *packet++ = dev->dev_addr[i]; -/* type */ - *packet++ =0x08 ; - *packet++ =0x06 ; -/* packet number */ - *packet++ = x; -/* fill packet with data */ -for (i =0 ; i < data_len; i++) - *packet++ = i; - - lp->tx_dma_addr[x] = -pci_map_single (lp->pci_dev, skb->data, skb->len, -PCI_DMA_TODEVICE ); - lp->tx_ring[x].base =cpu_to_le32 (lp->tx_dma_addr[x]); -wmb ();/* Make sure owner changes after all others are visible */ - lp->tx_ring[x].status =cpu_to_le16 (status); } + packet = skb->data; +skb_put (skb, size);/* create space for data */ + lp->tx_skbuff[x] = skb; + lp->tx_ring[x].length =cpu_to_le16 (-skb->len); + lp->tx_ring[x].misc =0 ; + +/* put DA and SA into the skb */ +for (i =0 ; i <6 ; i++) + *packet++ = dev->dev_addr[i]; +for (i =0 ; i <6 ; i++) + *packet++ = dev->dev_addr[i]; +/* type */ + *packet++ =0x08 ; + *packet++ =0x06 ; +/* packet number */ + *packet++ = x; +/* fill packet with data */ +for (i =0 ; i < data_len; i++) + *packet++ = i; + + lp->tx_dma_addr[x] = +pci_map_single (lp->pci_dev, skb->data, skb->len, +PCI_DMA_TODEVICE ); + lp->tx_ring[x].base =cpu_to_le32 (lp->tx_dma_addr[x]); +wmb ();/* Make sure owner changes after all others are visible */ + lp->tx_ring[x].status =cpu_to_le16 (status); } x = a->read_bcr (ioaddr,32 );/* set internal loopback in BCR32 */
@@ -978,9 +978,8 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)for (x =0 ; x < numbuffs; x++) {netdev_printk (KERN_DEBUG , dev,"Packet %d: " , x); skb = lp->rx_skbuff[x]; -for (i =0 ; i < size; i++) { +for (i =0 ; i < size; i++)pr_cont (" %02x" , *(skb->data + i)); - }pr_cont ("\n" ); } }
@@ -1002,7 +1001,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) x++; } - clean_up: +clean_up: *data1 = rc;pcnet32_purge_tx_ring (dev);
@@ -1021,7 +1020,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) }spin_unlock_irqrestore (&lp->lock, flags); -return (rc); +return rc; }/* end pcnet32_loopback_test */ static void pcnet32_led_blink_callback (struct net_device *dev)
@@ -1033,9 +1032,8 @@ static void pcnet32_led_blink_callback(struct net_device *dev)int i;spin_lock_irqsave (&lp->lock, flags); -for (i =4 ; i <8 ; i++) { +for (i =4 ; i <8 ; i++) a->write_bcr (ioaddr, i, a->read_bcr (ioaddr, i) ^0x4000 ); - }spin_unlock_irqrestore (&lp->lock, flags);mod_timer (&lp->blink_timer,PCNET32_BLINK_TIMEOUT );
@@ -1057,9 +1055,8 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)/* Save the current value of the bcrs */ spin_lock_irqsave (&lp->lock, flags); -for (i =4 ; i <8 ; i++) { +for (i =4 ; i <8 ; i++) regs[i -4 ] = a->read_bcr (ioaddr, i); - }spin_unlock_irqrestore (&lp->lock, flags);mod_timer (&lp->blink_timer, jiffies);
@@ -1074,9 +1071,8 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)/* Restore the original value of the bcrs */ spin_lock_irqsave (&lp->lock, flags); -for (i =4 ; i <8 ; i++) { +for (i =4 ; i <8 ; i++) a->write_bcr (ioaddr, i, regs[i -4 ]); - }spin_unlock_irqrestore (&lp->lock, flags);return 0 ;
@@ -1173,7 +1169,8 @@ static void pcnet32_rx_entry(struct net_device *dev,if (pkt_len > rx_copybreak) {struct sk_buff *newskb; -if ((newskb =dev_alloc_skb (PKT_BUF_SKB ))) { + newskb =dev_alloc_skb (PKT_BUF_SKB ); +if (newskb) {skb_reserve (newskb,NET_IP_ALIGN ); skb = lp->rx_skbuff[entry]; pci_unmap_single(lp->pci_dev,
@@ -1191,9 +1188,8 @@ static void pcnet32_rx_entry(struct net_device *dev, rx_in_place =1 ; }else skb =NULL ; - }else { + }else skb =dev_alloc_skb (pkt_len +NET_IP_ALIGN ); - }if (skb ==NULL ) {netif_err (lp, drv, dev,"Memory squeeze, dropping packet\n" );
@@ -1380,7 +1376,7 @@ static int pcnet32_get_regs_len(struct net_device *dev)struct pcnet32_private *lp =netdev_priv (dev);int j = lp->phycount *PCNET32_REGS_PER_PHY ; -return ((PCNET32_NUM_REGS + j) *sizeof (u16)); +return (PCNET32_NUM_REGS + j) *sizeof (u16); } static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
@@ -1404,21 +1400,20 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs, *buff++ =inw (ioaddr + i);/* read control and status registers */ -for (i =0 ; i <90 ; i++) { +for (i =0 ; i <90 ; i++) *buff++ = a->read_csr (ioaddr, i); - } *buff++ = a->read_csr (ioaddr,112 ); *buff++ = a->read_csr (ioaddr,114 );/* read bus configuration registers */ -for (i =0 ; i <30 ; i++) { +for (i =0 ; i <30 ; i++) *buff++ = a->read_bcr (ioaddr, i); - } + *buff++ =0 ;/* skip bcr30 so as not to hang 79C976 */ -for (i =31 ; i <36 ; i++) { + +for (i =31 ; i <36 ; i++) *buff++ = a->read_bcr (ioaddr, i); - }/* read mii phy registers */ if (lp->mii) {
@@ -1511,17 +1506,16 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)pr_err ("architecture does not support 32bit PCI busmaster DMA\n" );return -ENODEV ; } -if (request_region (ioaddr,PCNET32_TOTAL_SIZE ,"pcnet32_probe_pci" ) == -NULL ) { +if (!request_region (ioaddr,PCNET32_TOTAL_SIZE ,"pcnet32_probe_pci" )) {if (pcnet32_debug &NETIF_MSG_PROBE )pr_err ("io address range already allocated\n" );return -EBUSY ; } err =pcnet32_probe1 (ioaddr,1 , pdev); -if (err <0 ) { +if (err <0 )pci_disable_device (pdev); - } +return err; }
@@ -1764,8 +1758,9 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) dev->base_addr = ioaddr; lp =netdev_priv (dev);/* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */ -if ((lp->init_block = -pci_alloc_consistent (pdev,sizeof (*lp->init_block), &lp->init_dma_addr)) ==NULL ) { + lp->init_block =pci_alloc_consistent (pdev,sizeof (*lp->init_block), + &lp->init_dma_addr); +if (!lp->init_block) {if (pcnet32_debug &NETIF_MSG_PROBE )pr_err ("Consistent memory allocation failed\n" ); ret = -ENOMEM ;
@@ -1890,9 +1885,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) id1, id2, i); } lp->a.write_bcr (ioaddr,33 , (lp->mii_if.phy_id) <<5 ); -if (lp->phycount >1 ) { +if (lp->phycount >1 ) lp->options |=PCNET32_PORT_MII ; - } }init_timer (&lp->watchdog_timer);
@@ -2236,7 +2230,7 @@ static int pcnet32_open(struct net_device *dev)return 0 ;/* Always succeed */ - err_free_ring: +err_free_ring:/* free any allocated skbuffs */ pcnet32_purge_rx_ring (dev);
@@ -2246,7 +2240,7 @@ static int pcnet32_open(struct net_device *dev)*/ lp->a.write_bcr (ioaddr,20 ,4 ); - err_free_irq: +err_free_irq:spin_unlock_irqrestore (&lp->lock, flags);free_irq (dev->irq, dev);return rc;
@@ -2297,10 +2291,10 @@ static int pcnet32_init_ring(struct net_device *dev)for (i =0 ; i < lp->rx_ring_size; i++) {struct sk_buff *rx_skbuff = lp->rx_skbuff[i];if (rx_skbuff ==NULL ) { -if (! - (rx_skbuff = lp->rx_skbuff[i] = -dev_alloc_skb (PKT_BUF_SKB ))) { -/* there is not much, we can do at this point */ + lp->rx_skbuff[i] =dev_alloc_skb (PKT_BUF_SKB ); + rx_skbuff = lp->rx_skbuff[i]; +if (!rx_skbuff) { +/* there is not much we can do at this point */ netif_err (lp, drv, dev,"%s dev_alloc_skb failed\n" , __func__);return -1 ;
@@ -2482,9 +2476,8 @@ pcnet32_interrupt(int irq, void *dev_id) csr0 = lp->a.read_csr (ioaddr,CSR0 );while ((csr0 &0x8f00 ) && --boguscnt >=0 ) { -if (csr0 ==0xffff ) { +if (csr0 ==0xffff )break ;/* PCMCIA remove happened */ - }/* Acknowledge all of the current interrupt sources ASAP. */ lp->a.write_csr (ioaddr,CSR0 , csr0 & ~0x004f );
Signature · 1 line
1.7.0.14.g7e948
David Miller
maintainerFrom: Joe Perches <[email protected]>
Date: Mon, 15 Feb 2010 10:34:19 -0800
Quoted 1 line
And a few checkpatch cleanups
All applied to net-next-2.6, thanks Joe.