bna: Fix ethtool register dump and reordered an API

Change Details:
	- Removed semaphore register dump from ethtool
	- Moved netif_carrier_off() call to before calling bna_init()

Signed-off-by: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c
index 3c405022d2bbe4ed70e7234588ae4e1e2d845af0..5e7a0307f8535d902e8a81d2743be535f9f829b4 100644 (file)
--- a/drivers/net/bna/bnad.c
+++ b/drivers/net/bna/bnad.c
@@ -3061,6 +3061,9 @@ bnad_pci_probe(struct pci_dev *pdev,
        /* Initialize netdev structure, set up ethtool ops */
        bnad_netdev_init(bnad, using_dac);
 
+       /* Set link to down state */
+       netif_carrier_off(netdev);
+
        bnad_enable_msix(bnad);
 
        /* Get resource requirement form bna */
@@ -3114,11 +3117,6 @@ bnad_pci_probe(struct pci_dev *pdev,
 
        mutex_unlock(&bnad->conf_mutex);
 
-       /*
-        * Make sure the link appears down to the stack
-        */
-       netif_carrier_off(netdev);
-
        /* Finally, reguister with net_device layer */
        err = register_netdev(netdev);
        if (err) {

diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/bna/bnad_ethtool.c
index 11fa2ea842c1258c855e666ab1e5244b330c60c8..3011110c20233457b19309d7a6c506bfb6c27145 100644 (file)
--- a/drivers/net/bna/bnad_ethtool.c
+++ b/drivers/net/bna/bnad_ethtool.c
@@ -330,10 +330,6 @@ do {                                                               \
 
        BNAD_GET_REG(PCIE_MISC_REG);
 
-       BNAD_GET_REG(HOST_SEM0_REG);
-       BNAD_GET_REG(HOST_SEM1_REG);
-       BNAD_GET_REG(HOST_SEM2_REG);
-       BNAD_GET_REG(HOST_SEM3_REG);
        BNAD_GET_REG(HOST_SEM0_INFO_REG);
        BNAD_GET_REG(HOST_SEM1_INFO_REG);
        BNAD_GET_REG(HOST_SEM2_INFO_REG);