Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 428ac43f authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

chelsio: Use netdev_<level> and pr_<level> 



Use more current logging styles.

Convert printks to pr_<level> and
printks with ("%s: ...", dev->name to netdev_<level>(dev, "...

Add pr_fmt #defines where appropriate.
Coalesce formats.
Use pr_<level>_once where appropriate.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 483f7772

drivers/net/ethernet/chelsio/cxgb/cxgb2.c

+11 −17
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void t1_set_rxmode(struct net_device *dev) 
static void link_report(struct port_info *p)

{

	if (!netif_carrier_ok(p->dev))

		printk(KERN_INFO "%s: link down\n", p->dev->name);

		netdev_info(p->dev, "link down\n");

	else {

		const char *s = "10Mbps";
@@ -141,9 +141,9 @@ static void link_report(struct port_info *p) 
			case SPEED_100:   s = "100Mbps"; break;

		}



		printk(KERN_INFO "%s: link up, %s, %s-duplex\n",

		       p->dev->name, s,

		       p->link_config.duplex == DUPLEX_FULL ? "full" : "half");

		netdev_info(p->dev, "link up, %s, %s-duplex\n",

			    s, p->link_config.duplex == DUPLEX_FULL

			    ? "full" : "half");

	}

}
@@ -976,19 +976,13 @@ static const struct net_device_ops cxgb_netdev_ops = { 


static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	static int version_printed;



	int i, err, pci_using_dac = 0;

	unsigned long mmio_start, mmio_len;

	const struct board_info *bi;

	struct adapter *adapter = NULL;

	struct port_info *pi;



	if (!version_printed) {

		printk(KERN_INFO "%s - version %s\n", DRV_DESCRIPTION,

		       DRV_VERSION);

		++version_printed;

	}

	pr_info_once("%s - version %s\n", DRV_DESCRIPTION, DRV_VERSION);



	err = pci_enable_device(pdev);

	if (err)
@@ -1124,7 +1118,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	for (i = 0; i < bi->port_number; ++i) {

		err = register_netdev(adapter->port[i].dev);

		if (err)

			pr_warning("%s: cannot register net device %s, skipping\n",

			pr_warn("%s: cannot register net device %s, skipping\n",

				pci_name(pdev), adapter->port[i].dev->name);

		else {

			/*
@@ -1143,8 +1137,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_release_adapter_res;

	}



	printk(KERN_INFO "%s: %s (rev %d), %s %dMHz/%d-bit\n", adapter->name,

	       bi->desc, adapter->params.chip_revision,

	pr_info("%s: %s (rev %d), %s %dMHz/%d-bit\n",

		adapter->name, bi->desc, adapter->params.chip_revision,

		adapter->params.pci.is_pcix ? "PCIX" : "PCI",

		adapter->params.pci.speed, adapter->params.pci.width);

drivers/net/ethernet/chelsio/cxgb/sge.c

+3 −3
Original line number Diff line number Diff line
@@ -1822,7 +1822,7 @@ netdev_tx_t t1_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		 */

		if (unlikely(skb->len < ETH_HLEN ||

			     skb->len > dev->mtu + eth_hdr_len(skb->data))) {

			pr_debug("%s: packet size %d hdr %d mtu%d\n", dev->name,

			netdev_dbg(dev, "packet size %d hdr %d mtu%d\n",

				   skb->len, eth_hdr_len(skb->data), dev->mtu);

			dev_kfree_skb_any(skb);

			return NETDEV_TX_OK;
@@ -1831,7 +1831,7 @@ netdev_tx_t t1_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		if (skb->ip_summed == CHECKSUM_PARTIAL &&

		    ip_hdr(skb)->protocol == IPPROTO_UDP) {

			if (unlikely(skb_checksum_help(skb))) {

				pr_debug("%s: unable to do udp checksum\n", dev->name);

				netdev_dbg(dev, "unable to do udp checksum\n");

				dev_kfree_skb_any(skb);

				return NETDEV_TX_OK;

			}

drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

+19 −23
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>
@@ -153,7 +156,7 @@ struct workqueue_struct *cxgb3_wq; 
static void link_report(struct net_device *dev)

{

	if (!netif_carrier_ok(dev))

		printk(KERN_INFO "%s: link down\n", dev->name);

		netdev_info(dev, "link down\n");

	else {

		const char *s = "10Mbps";

		const struct port_info *p = netdev_priv(dev);
@@ -170,8 +173,9 @@ static void link_report(struct net_device *dev) 
			break;

		}



		printk(KERN_INFO "%s: link up, %s, %s-duplex\n", dev->name, s,

		       p->link_config.duplex == DUPLEX_FULL ? "full" : "half");

		netdev_info(dev, "link up, %s, %s-duplex\n",

			    s, p->link_config.duplex == DUPLEX_FULL

			    ? "full" : "half");

	}

}
@@ -318,9 +322,9 @@ void t3_os_phymod_changed(struct adapter *adap, int port_id) 
	const struct port_info *pi = netdev_priv(dev);



	if (pi->phy.modtype == phy_modtype_none)

		printk(KERN_INFO "%s: PHY module unplugged\n", dev->name);

		netdev_info(dev, "PHY module unplugged\n");

	else

		printk(KERN_INFO "%s: %s PHY module inserted\n", dev->name,

		netdev_info(dev, "%s PHY module inserted\n",

			    mod_str[pi->phy.modtype]);

}
@@ -1422,8 +1426,7 @@ static int cxgb_open(struct net_device *dev) 
	if (is_offload(adapter) && !ofld_disable) {

		err = offload_open(dev);

		if (err)

			printk(KERN_WARNING

			       "Could not initialize offload capabilities\n");

			pr_warn("Could not initialize offload capabilities\n");

	}



	netif_set_real_num_tx_queues(dev, pi->nqsets);
@@ -3132,14 +3135,13 @@ static void print_port_info(struct adapter *adap, const struct adapter_info *ai) 


		if (!test_bit(i, &adap->registered_device_map))

			continue;

		printk(KERN_INFO "%s: %s %s %sNIC (rev %d) %s%s\n",

		       dev->name, ai->desc, pi->phy.desc,

		netdev_info(dev, "%s %s %sNIC (rev %d) %s%s\n",

			    ai->desc, pi->phy.desc,

			    is_offload(adap) ? "R" : "", adap->params.rev, buf,

			    (adap->flags & USING_MSIX) ? " MSI-X" :

			    (adap->flags & USING_MSI) ? " MSI" : "");

		if (adap->name == dev->name && adap->params.vpd.mclk)

			printk(KERN_INFO

			       "%s: %uMB CM, %uMB PMTX, %uMB PMRX, S/N: %s\n",

			pr_info("%s: %uMB CM, %uMB PMTX, %uMB PMRX, S/N: %s\n",

			       adap->name, t3_mc7_size(&adap->cm) >> 20,

			       t3_mc7_size(&adap->pmtx) >> 20,

			       t3_mc7_size(&adap->pmrx) >> 20,
@@ -3177,24 +3179,18 @@ static void cxgb3_init_iscsi_mac(struct net_device *dev) 
			NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)

static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	static int version_printed;



	int i, err, pci_using_dac = 0;

	resource_size_t mmio_start, mmio_len;

	const struct adapter_info *ai;

	struct adapter *adapter = NULL;

	struct port_info *pi;



	if (!version_printed) {

		printk(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);

		++version_printed;

	}

	pr_info_once("%s - version %s\n", DRV_DESC, DRV_VERSION);



	if (!cxgb3_wq) {

		cxgb3_wq = create_singlethread_workqueue(DRV_NAME);

		if (!cxgb3_wq) {

			printk(KERN_ERR DRV_NAME

			       ": cannot initialize work queue\n");

			pr_err("cannot initialize work queue\n");

			return -ENOMEM;

		}

	}

drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c

+24 −30
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
 * SOFTWARE.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/list.h>

#include <linux/slab.h>

#include <net/neighbour.h>
@@ -235,8 +237,7 @@ static int cxgb_ulp_iscsi_ctl(struct adapter *adapter, unsigned int req, 
		if ((val >> S_MAXRXDATA) != 0x3f60) {

			val &= (M_RXCOALESCESIZE << S_RXCOALESCESIZE);

			val |= V_MAXRXDATA(0x3f60);

			printk(KERN_INFO

				"%s, iscsi set MaxRxData to 16224 (0x%x).\n",

			pr_info("%s, iscsi set MaxRxData to 16224 (0x%x)\n",

				adapter->name, val);

			t3_write_reg(adapter, A_TP_PARA_REG2, val);

		}
@@ -256,8 +257,7 @@ static int cxgb_ulp_iscsi_ctl(struct adapter *adapter, unsigned int req, 
		for (i = 0; i < 4; i++)

			val |= (uiip->pgsz_factor[i] & 0xF) << (8 * i);

		if (val && (val != t3_read_reg(adapter, A_ULPRX_ISCSI_PSZ))) {

			printk(KERN_INFO

				"%s, setting iscsi pgsz 0x%x, %u,%u,%u,%u.\n",

			pr_info("%s, setting iscsi pgsz 0x%x, %u,%u,%u,%u\n",

				adapter->name, val, uiip->pgsz_factor[0],

				uiip->pgsz_factor[1], uiip->pgsz_factor[2],

				uiip->pgsz_factor[3]);
@@ -709,8 +709,7 @@ static int do_smt_write_rpl(struct t3cdev *dev, struct sk_buff *skb) 
	struct cpl_smt_write_rpl *rpl = cplhdr(skb);



	if (rpl->status != CPL_ERR_NONE)

		printk(KERN_ERR

		       "Unexpected SMT_WRITE_RPL status %u for entry %u\n",

		pr_err("Unexpected SMT_WRITE_RPL status %u for entry %u\n",

		       rpl->status, GET_TID(rpl));



	return CPL_RET_BUF_DONE;
@@ -721,8 +720,7 @@ static int do_l2t_write_rpl(struct t3cdev *dev, struct sk_buff *skb) 
	struct cpl_l2t_write_rpl *rpl = cplhdr(skb);



	if (rpl->status != CPL_ERR_NONE)

		printk(KERN_ERR

		       "Unexpected L2T_WRITE_RPL status %u for entry %u\n",

		pr_err("Unexpected L2T_WRITE_RPL status %u for entry %u\n",

		       rpl->status, GET_TID(rpl));



	return CPL_RET_BUF_DONE;
@@ -733,8 +731,7 @@ static int do_rte_write_rpl(struct t3cdev *dev, struct sk_buff *skb) 
	struct cpl_rte_write_rpl *rpl = cplhdr(skb);



	if (rpl->status != CPL_ERR_NONE)

		printk(KERN_ERR

		       "Unexpected RTE_WRITE_RPL status %u for entry %u\n",

		pr_err("Unexpected RTE_WRITE_RPL status %u for entry %u\n",

		       rpl->status, GET_TID(rpl));



	return CPL_RET_BUF_DONE;
@@ -754,7 +751,7 @@ static int do_act_open_rpl(struct t3cdev *dev, struct sk_buff *skb) 
								    t3c_tid->

								    ctx);

	} else {

		printk(KERN_ERR "%s: received clientless CPL command 0x%x\n",

		pr_err("%s: received clientless CPL command 0x%x\n",

		       dev->name, CPL_ACT_OPEN_RPL);

		return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;

	}
@@ -772,7 +769,7 @@ static int do_stid_rpl(struct t3cdev *dev, struct sk_buff *skb) 
		return t3c_tid->client->handlers[p->opcode] (dev, skb,

							     t3c_tid->ctx);

	} else {

		printk(KERN_ERR "%s: received clientless CPL command 0x%x\n",

		pr_err("%s: received clientless CPL command 0x%x\n",

		       dev->name, p->opcode);

		return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;

	}
@@ -790,7 +787,7 @@ static int do_hwtid_rpl(struct t3cdev *dev, struct sk_buff *skb) 
		return t3c_tid->client->handlers[p->opcode]

		    (dev, skb, t3c_tid->ctx);

	} else {

		printk(KERN_ERR "%s: received clientless CPL command 0x%x\n",

		pr_err("%s: received clientless CPL command 0x%x\n",

		       dev->name, p->opcode);

		return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;

	}
@@ -817,7 +814,7 @@ static int do_cr(struct t3cdev *dev, struct sk_buff *skb) 
		return t3c_tid->client->handlers[CPL_PASS_ACCEPT_REQ]

		    (dev, skb, t3c_tid->ctx);

	} else {

		printk(KERN_ERR "%s: received clientless CPL command 0x%x\n",

		pr_err("%s: received clientless CPL command 0x%x\n",

		       dev->name, CPL_PASS_ACCEPT_REQ);

		return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;

	}
@@ -911,7 +908,7 @@ static int do_act_establish(struct t3cdev *dev, struct sk_buff *skb) 
		return t3c_tid->client->handlers[CPL_ACT_ESTABLISH]

		    (dev, skb, t3c_tid->ctx);

	} else {

		printk(KERN_ERR "%s: received clientless CPL command 0x%x\n",

		pr_err("%s: received clientless CPL command 0x%x\n",

		       dev->name, CPL_ACT_ESTABLISH);

		return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;

	}
@@ -957,7 +954,7 @@ static int do_term(struct t3cdev *dev, struct sk_buff *skb) 
		return t3c_tid->client->handlers[opcode] (dev, skb,

							  t3c_tid->ctx);

	} else {

		printk(KERN_ERR "%s: received clientless CPL command 0x%x\n",

		pr_err("%s: received clientless CPL command 0x%x\n",

		       dev->name, opcode);

		return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;

	}
@@ -994,8 +991,7 @@ static struct notifier_block nb = { 
 */

static int do_bad_cpl(struct t3cdev *dev, struct sk_buff *skb)

{

	printk(KERN_ERR "%s: received bad CPL command 0x%x\n", dev->name,

	       *skb->data);

	pr_err("%s: received bad CPL command 0x%x\n", dev->name, *skb->data);

	return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;

}
@@ -1013,8 +1009,8 @@ void t3_register_cpl_handler(unsigned int opcode, cpl_handler_func h) 
	if (opcode < NUM_CPL_CMDS)

		cpl_handlers[opcode] = h ? h : do_bad_cpl;

	else

		printk(KERN_ERR "T3C: handler registration for "

		       "opcode %x failed\n", opcode);

		pr_err("T3C: handler registration for opcode %x failed\n",

		       opcode);

}



EXPORT_SYMBOL(t3_register_cpl_handler);
@@ -1033,9 +1029,8 @@ static int process_rx(struct t3cdev *dev, struct sk_buff **skbs, int n) 
		if (ret & CPL_RET_UNKNOWN_TID) {

			union opcode_tid *p = cplhdr(skb);



			printk(KERN_ERR "%s: CPL message (opcode %u) had "

			       "unknown TID %u\n", dev->name, opcode,

			       G_TID(ntohl(p->opcode_tid)));

			pr_err("%s: CPL message (opcode %u) had unknown TID %u\n",

			       dev->name, opcode, G_TID(ntohl(p->opcode_tid)));

		}

#endif

		if (ret & CPL_RET_BUF_DONE)
@@ -1099,7 +1094,7 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e) 


	skb = alloc_skb(sizeof(*req), GFP_ATOMIC);

	if (!skb) {

		printk(KERN_ERR "%s: cannot allocate skb!\n", __func__);

		pr_err("%s: cannot allocate skb!\n", __func__);

		return;

	}

	skb->priority = CPL_PRIORITY_CONTROL;
@@ -1132,23 +1127,22 @@ static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh, 
	if (!is_offloading(olddev))

		return;

	if (!is_offloading(newdev)) {

		printk(KERN_WARNING "%s: Redirect to non-offload "

		       "device ignored.\n", __func__);

		pr_warn("%s: Redirect to non-offload device ignored\n",

			__func__);

		return;

	}

	tdev = dev2t3cdev(olddev);

	BUG_ON(!tdev);

	if (tdev != dev2t3cdev(newdev)) {

		printk(KERN_WARNING "%s: Redirect to different "

		       "offload device ignored.\n", __func__);

		pr_warn("%s: Redirect to different offload device ignored\n",

			__func__);

		return;

	}



	/* Add new L2T entry */

	e = t3_l2t_get(tdev, new, newdev, daddr);

	if (!e) {

		printk(KERN_ERR "%s: couldn't allocate new l2t entry!\n",

		       __func__);

		pr_err("%s: couldn't allocate new l2t entry!\n", __func__);

		return;

	}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5131,7 +5131,7 @@ static int __init cxgb4_init_module(void) 
	/* Debugfs support is optional, just warn if this fails */

	cxgb4_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);

	if (!cxgb4_debugfs_root)

		pr_warning("could not create debugfs entry, continuing\n");

		pr_warn("could not create debugfs entry, continuing\n");



	ret = pci_register_driver(&cxgb4_driver);

	if (ret < 0)