aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic/qlcnic_init.c
diff options
context:
space:
mode:
authorAnirban Chakraborty <anirban.chakraborty@qlogic.com>2010-06-29 03:52:12 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-29 18:12:36 -0400
commit45918e2fe582d845a2649ffa015754ae44be9a8b (patch)
tree6d5c6481b3eb301d8fa160f493daef7202fbce0f /drivers/net/qlcnic/qlcnic_init.c
parent51f932c4870f785d73d5fd5fed33306e63cf4efc (diff)
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 'drivers/net/qlcnic/qlcnic_init.c')
-rw-r--r--drivers/net/qlcnic/qlcnic_init.c16
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) {
548 int timeo; 548 int timeo;
549 u32 val; 549 u32 val;
550 550
551 if (adapter->fw_hal_version == QLCNIC_FW_BASE) { 551 val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO);
552 val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO); 552 val = QLC_DEV_GET_DRV(val, adapter->portnum);
553 val = QLC_DEV_GET_DRV(val, adapter->portnum); 553 if ((val & 0x3) != QLCNIC_TYPE_NIC) {
554 if ((val & 0x3) != QLCNIC_TYPE_NIC) { 554 dev_err(&adapter->pdev->dev,
555 dev_err(&adapter->pdev->dev, 555 "Not an Ethernet NIC func=%u\n", val);
556 "Not an Ethernet NIC func=%u\n", val); 556 return -EIO;
557 return -EIO;
558 }
559 adapter->physical_port = (val >> 2);
560 } 557 }
558 adapter->physical_port = (val >> 2);
561 if (qlcnic_rom_fast_read(adapter, QLCNIC_ROM_DEV_INIT_TIMEOUT, &timeo)) 559 if (qlcnic_rom_fast_read(adapter, QLCNIC_ROM_DEV_INIT_TIMEOUT, &timeo))
562 timeo = 30; 560 timeo = 30;
563 561