diff options
author | Michael Chan <mchan@broadcom.com> | 2012-12-06 05:33:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-07 12:44:02 -0500 |
commit | 4bd9b0fffb193d2e288f67f81821af32df8d4349 (patch) | |
tree | b2e19d3ffeac16974eda2d396f543a1d25466f1c /drivers/net/ethernet/broadcom/bnx2.c | |
parent | 68c64d2034faa0961ad4a38b915dc10a4581bb64 (diff) |
cnic, bnx2x, bnx2: Simplify cnic probing.
Instead of using symbol_get(), cnic can now directly call the cnic_probe
functions in struct bnx2x and struct bnx2. symbol_get() is not reliable
as it fails when the module is still initializing.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index a9b2feaf2879..c16526d3046f 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
@@ -434,7 +434,6 @@ struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev) | |||
434 | 434 | ||
435 | return cp; | 435 | return cp; |
436 | } | 436 | } |
437 | EXPORT_SYMBOL(bnx2_cnic_probe); | ||
438 | 437 | ||
439 | static void | 438 | static void |
440 | bnx2_cnic_stop(struct bnx2 *bp) | 439 | bnx2_cnic_stop(struct bnx2 *bp) |
@@ -8422,6 +8421,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) | |||
8422 | bp->cnic_eth_dev.max_iscsi_conn = | 8421 | bp->cnic_eth_dev.max_iscsi_conn = |
8423 | (bnx2_shmem_rd(bp, BNX2_ISCSI_MAX_CONN) & | 8422 | (bnx2_shmem_rd(bp, BNX2_ISCSI_MAX_CONN) & |
8424 | BNX2_ISCSI_MAX_CONN_MASK) >> BNX2_ISCSI_MAX_CONN_SHIFT; | 8423 | BNX2_ISCSI_MAX_CONN_MASK) >> BNX2_ISCSI_MAX_CONN_SHIFT; |
8424 | bp->cnic_probe = bnx2_cnic_probe; | ||
8425 | #endif | 8425 | #endif |
8426 | pci_save_state(pdev); | 8426 | pci_save_state(pdev); |
8427 | 8427 | ||