be2net: Bug fix in init code in probe

[net-next-2.6.git] / drivers / net / benet / be_main.c

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index fa10f13242c31cd67f6713b1d649d4074b165307..1c79c2009e40cf35e92167ab84df1bbd1d8ea2c6 100644 (file)
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -830,7 +830,6 @@ static void skb_fill_rx_data(struct be_adapter *adapter,
 
 done:
        be_rx_stats_update(adapter, pktsize, num_rcvd);
-       return;
 }
 
 /* Process the RX completion indicated by rxcp when GRO is disabled */
@@ -884,8 +883,6 @@ static void be_rx_compl_process(struct be_adapter *adapter,
        } else {
                netif_receive_skb(skb);
        }
-
-       return;
 }
 
 /* Process the RX completion indicated by rxcp when GRO is enabled */
@@ -965,7 +962,6 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
        }
 
        be_rx_stats_update(adapter, pkt_size, num_rcvd);
-       return;
 }
 
 static struct be_eth_rx_compl *be_rx_compl_get(struct be_adapter *adapter)
@@ -1059,8 +1055,6 @@ static void be_post_rx_frags(struct be_adapter *adapter)
                /* Let be_worker replenish when memory is available */
                adapter->rx_post_starved = true;
        }
-
-       return;
 }
 
 static struct be_eth_tx_compl *be_tx_compl_get(struct be_queue_info *tx_cq)
@@ -1622,7 +1616,6 @@ static void be_msix_enable(struct be_adapter *adapter)
                BE_NUM_MSIX_VECTORS);
        if (status == 0)
                adapter->msix_enabled = true;
-       return;
 }
 
 static void be_sriov_enable(struct be_adapter *adapter)
@@ -1634,7 +1627,6 @@ static void be_sriov_enable(struct be_adapter *adapter)
                adapter->sriov_enabled = status ? false : true;
        }
 #endif
-       return;
 }
 
 static void be_sriov_disable(struct be_adapter *adapter)
@@ -1741,7 +1733,6 @@ static void be_irq_unregister(struct be_adapter *adapter)
        be_free_irq(adapter, &adapter->rx_eq);
 done:
        adapter->isr_registered = false;
-       return;
 }
 
 static int be_open(struct net_device *netdev)
@@ -2496,10 +2487,6 @@ static int __devinit be_probe(struct pci_dev *pdev,
                status = be_cmd_POST(adapter);
                if (status)
                        goto ctrl_clean;
-
-               status = be_cmd_reset_function(adapter);
-               if (status)
-                       goto ctrl_clean;
        }
 
        /* tell fw we're ready to fire cmds */
@@ -2507,6 +2494,12 @@ static int __devinit be_probe(struct pci_dev *pdev,
        if (status)
                goto ctrl_clean;
 
+       if (be_physfn(adapter)) {
+               status = be_cmd_reset_function(adapter);
+               if (status)
+                       goto ctrl_clean;
+       }
+
        status = be_stats_init(adapter);
        if (status)
                goto ctrl_clean;
@@ -2620,8 +2613,6 @@ static void be_shutdown(struct pci_dev *pdev)
                be_setup_wol(adapter, true);
 
        pci_disable_device(pdev);
-
-       return;
 }
 
 static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev,
@@ -2703,7 +2694,6 @@ static void be_eeh_resume(struct pci_dev *pdev)
        return;
 err:
        dev_err(&adapter->pdev->dev, "EEH resume failed\n");
-       return;
 }
 
 static struct pci_error_handlers be_eeh_handlers = {