diff options
| author |   Anirban Chakraborty <anirban.chakraborty@qlogic.com> | 2010-06-29 07:52:12 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-29 15:12:36 -0700 |
| commit | 45918e2fe582d845a2649ffa015754ae44be9a8b (patch) | |
| tree | 6d5c6481b3eb301d8fa160f493daef7202fbce0f /drivers/net/qlcnic/qlcnic_init.c | |
| parent | micrel phy driver - updated(1) (diff) | |
| download | linux-dev-45918e2fe582d845a2649ffa015754ae44be9a8b.tar.xz linux-dev-45918e2fe582d845a2649ffa015754ae44be9a8b.zip | |
qlcnic: Remove obsolete code
Current driver uses FW API version 2 and thus code corresponding to FW API
version 1 has become obsolete. Clean up this from the driver.
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_init.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c index 6678127ed4f2..75ba744b173c 100644 --- a/drivers/net/qlcnic/qlcnic_init.c +++ b/drivers/net/qlcnic/qlcnic_init.c @@ -548,16 +548,14 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) { int timeo; u32 val; - if (adapter->fw_hal_version == QLCNIC_FW_BASE) { - val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO); - val = QLC_DEV_GET_DRV(val, adapter->portnum); - if ((val & 0x3) != QLCNIC_TYPE_NIC) { - dev_err(&adapter->pdev->dev, - "Not an Ethernet NIC func=%u\n", val); - return -EIO; - } - adapter->physical_port = (val >> 2); + val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO); + val = QLC_DEV_GET_DRV(val, adapter->portnum); + if ((val & 0x3) != QLCNIC_TYPE_NIC) { + dev_err(&adapter->pdev->dev, + "Not an Ethernet NIC func=%u\n", val); + return -EIO; } + adapter->physical_port = (val >> 2); if (qlcnic_rom_fast_read(adapter, QLCNIC_ROM_DEV_INIT_TIMEOUT, &timeo)) timeo = 30; |