Re: [PATCH net-next 19/19] bna: use netdev_* and dev_* instead of printk and pr_*
On 06/10/2015 10:29 PM, Joe Perches wrote: On Wed, 2015-06-10 at 18:43 +0200, Ivan Vecera wrote: Signed-off-by: Ivan Vecera ivec...@redhat.com There should be some indication a few messages have been deleted in the commit log and a reason why too. diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c [] @@ -965,10 +964,6 @@ bnad_cb_ethport_link_status(struct bnad *bnad, /* * Force an immediate * Transmit Schedule */ - printk(KERN_INFO bna: %s %d - TXQ_STARTED\n, - bnad-netdev-name, - txq_id); [] @@ -1057,8 +1051,6 @@ bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx) txq_id = tcb-id; clear_bit(BNAD_TXQ_TX_STARTED, tcb-flags); netif_stop_subqueue(bnad-netdev, txq_id); - printk(KERN_INFO bna: %s %d TXQ_STOPPED\n, - bnad-netdev-name, txq_id); etc... I'm sorry I have removed them as logging noise. IMHO it is not necessary to log when .probe() and .remove() are called or when TxQ is started or stopped. Ivan -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH net-next 19/19] bna: use netdev_* and dev_* instead of printk and pr_*
On Thu, 2015-06-11 at 11:43 +0200, Ivan Vecera wrote: On 06/10/2015 10:29 PM, Joe Perches wrote: On Wed, 2015-06-10 at 18:43 +0200, Ivan Vecera wrote: Signed-off-by: Ivan Vecera ivec...@redhat.com There should be some indication a few messages have been deleted in the commit log and a reason why too. diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c [] @@ -965,10 +964,6 @@ bnad_cb_ethport_link_status(struct bnad *bnad, /* * Force an immediate * Transmit Schedule */ - printk(KERN_INFO bna: %s %d -TXQ_STARTED\n, - bnad-netdev-name, - txq_id); [] @@ -1057,8 +1051,6 @@ bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx) txq_id = tcb-id; clear_bit(BNAD_TXQ_TX_STARTED, tcb-flags); netif_stop_subqueue(bnad-netdev, txq_id); - printk(KERN_INFO bna: %s %d TXQ_STOPPED\n, - bnad-netdev-name, txq_id); etc... I'm sorry I have removed them as logging noise. IMHO it is not necessary to log when .probe() and .remove() are called or when TxQ is started or stopped. I don't disagree at all, but it should be mentioned in the commit message. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH net-next 19/19] bna: use netdev_* and dev_* instead of printk and pr_*
Signed-off-by: Ivan Vecera ivec...@redhat.com
---
drivers/net/ethernet/brocade/bna/bnad.c | 46 +
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 34 --
drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 9 ++---
drivers/net/ethernet/brocade/bna/cna_fwimg.c| 2 +-
4 files changed, 36 insertions(+), 55 deletions(-)
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c
b/drivers/net/ethernet/brocade/bna/bnad.c
index ddda6f1..d9e0f81 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -945,8 +945,7 @@ bnad_cb_ethport_link_status(struct bnad *bnad,
if (link_up) {
if (!netif_carrier_ok(bnad-netdev)) {
uint tx_id, tcb_id;
- printk(KERN_WARNING bna: %s link up\n,
- bnad-netdev-name);
+ netdev_info(bnad-netdev, link up\n);
netif_carrier_on(bnad-netdev);
BNAD_UPDATE_CTR(bnad, link_toggle);
for (tx_id = 0; tx_id bnad-num_tx; tx_id++) {
@@ -965,10 +964,6 @@ bnad_cb_ethport_link_status(struct bnad *bnad,
/*
* Force an immediate
* Transmit Schedule */
- printk(KERN_INFO bna: %s %d
- TXQ_STARTED\n,
- bnad-netdev-name,
- txq_id);
netif_wake_subqueue(
bnad-netdev,
txq_id);
@@ -986,8 +981,7 @@ bnad_cb_ethport_link_status(struct bnad *bnad,
}
} else {
if (netif_carrier_ok(bnad-netdev)) {
- printk(KERN_WARNING bna: %s link down\n,
- bnad-netdev-name);
+ netdev_info(bnad-netdev, link down\n);
netif_carrier_off(bnad-netdev);
BNAD_UPDATE_CTR(bnad, link_toggle);
}
@@ -1057,8 +1051,6 @@ bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx)
txq_id = tcb-id;
clear_bit(BNAD_TXQ_TX_STARTED, tcb-flags);
netif_stop_subqueue(bnad-netdev, txq_id);
- printk(KERN_INFO bna: %s %d TXQ_STOPPED\n,
- bnad-netdev-name, txq_id);
}
}
@@ -1081,8 +1073,6 @@ bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)
BUG_ON(*(tcb-hw_consumer_index) != 0);
if (netif_carrier_ok(bnad-netdev)) {
- printk(KERN_INFO bna: %s %d TXQ_STARTED\n,
- bnad-netdev-name, txq_id);
netif_wake_subqueue(bnad-netdev, txq_id);
BNAD_UPDATE_CTR(bnad, netif_queue_wakeup);
}
@@ -2135,7 +2125,7 @@ bnad_reinit_rx(struct bnad *bnad)
current_err = bnad_setup_rx(bnad, rx_id);
if (current_err !err) {
err = current_err;
- pr_err(RXQ:%u setup failed\n, rx_id);
+ netdev_err(netdev, RXQ:%u setup failed\n, rx_id);
}
}
@@ -2671,8 +2661,9 @@ bnad_enable_msix(struct bnad *bnad)
if (ret 0) {
goto intx_mode;
} else if (ret bnad-msix_num) {
- pr_warn(BNA: %d MSI-X vectors allocated %d requested\n,
- ret, bnad-msix_num);
+ dev_warn(bnad-pcidev-dev,
+%d MSI-X vectors allocated %d requested\n,
+ret, bnad-msix_num);
spin_lock_irqsave(bnad-bna_lock, flags);
/* ret = #of vectors that we got */
@@ -2694,7 +2685,8 @@ bnad_enable_msix(struct bnad *bnad)
return;
intx_mode:
- pr_warn(BNA: MSI-X enable failed - operating in INTx mode\n);
+ dev_warn(bnad-pcidev-dev,
+MSI-X enable failed - operating in INTx mode\n);
kfree(bnad-msix_table);
bnad-msix_table = NULL;
@@ -3482,8 +3474,8 @@ bnad_init(struct bnad *bnad,
dev_err(pdev-dev, ioremap for bar0 failed\n);
return -ENOMEM;
}
- pr_info(bar0 mapped to %p, len %llu\n, bnad-bar0,
- (unsigned long long) bnad-mmio_len);
+ dev_info(pdev-dev, bar0 mapped to %p, len %llu\n, bnad-bar0,
+(unsigned long long) bnad-mmio_len);
spin_lock_irqsave(bnad-bna_lock, flags);
if (!bnad_msix_disable)
@@ -3604,13 +3596,10 @@ bnad_pci_probe(struct pci_dev *pdev,
struct bfa_pcidev pcidev_info;
Re: [PATCH net-next 19/19] bna: use netdev_* and dev_* instead of printk and pr_*
On Wed, 2015-06-10 at 18:43 +0200, Ivan Vecera wrote: Signed-off-by: Ivan Vecera ivec...@redhat.com There should be some indication a few messages have been deleted in the commit log and a reason why too. diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c [] @@ -965,10 +964,6 @@ bnad_cb_ethport_link_status(struct bnad *bnad, /* * Force an immediate * Transmit Schedule */ - printk(KERN_INFO bna: %s %d - TXQ_STARTED\n, -bnad-netdev-name, -txq_id); [] @@ -1057,8 +1051,6 @@ bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx) txq_id = tcb-id; clear_bit(BNAD_TXQ_TX_STARTED, tcb-flags); netif_stop_subqueue(bnad-netdev, txq_id); - printk(KERN_INFO bna: %s %d TXQ_STOPPED\n, - bnad-netdev-name, txq_id); etc... -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
