diff options
author | stephen hemminger <stephen@networkplumber.org> | 2014-01-16 13:32:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-17 21:04:19 -0500 |
commit | c3bc40e28be45cb168bae2b0b0a0731742eb4fa9 (patch) | |
tree | 0e7a0f1122e89db442a2022856cc1de206d47f42 | |
parent | 21041400438ea816fa4ef1967fffa743e811f800 (diff) |
qlcnic: remove unused code
Remove function qlcnic_enable_eswitch which was defined
but never used in current code.
Compile tested only.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 30 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 1 |
2 files changed, 0 insertions, 31 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index 6e10ac5bfc40..8d2ac225c010 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | |||
@@ -2196,36 +2196,6 @@ out: | |||
2196 | return IRQ_HANDLED; | 2196 | return IRQ_HANDLED; |
2197 | } | 2197 | } |
2198 | 2198 | ||
2199 | int qlcnic_enable_eswitch(struct qlcnic_adapter *adapter, u8 port, u8 enable) | ||
2200 | { | ||
2201 | int err = -EIO; | ||
2202 | struct qlcnic_cmd_args cmd; | ||
2203 | |||
2204 | if (adapter->ahw->op_mode != QLCNIC_MGMT_FUNC) { | ||
2205 | dev_err(&adapter->pdev->dev, | ||
2206 | "%s: Error, invoked by non management func\n", | ||
2207 | __func__); | ||
2208 | return err; | ||
2209 | } | ||
2210 | |||
2211 | err = qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_TOGGLE_ESWITCH); | ||
2212 | if (err) | ||
2213 | return err; | ||
2214 | |||
2215 | cmd.req.arg[1] = (port & 0xf) | BIT_4; | ||
2216 | err = qlcnic_issue_cmd(adapter, &cmd); | ||
2217 | |||
2218 | if (err != QLCNIC_RCODE_SUCCESS) { | ||
2219 | dev_err(&adapter->pdev->dev, "Failed to enable eswitch%d\n", | ||
2220 | err); | ||
2221 | err = -EIO; | ||
2222 | } | ||
2223 | qlcnic_free_mbx_args(&cmd); | ||
2224 | |||
2225 | return err; | ||
2226 | |||
2227 | } | ||
2228 | |||
2229 | int qlcnic_83xx_set_nic_info(struct qlcnic_adapter *adapter, | 2199 | int qlcnic_83xx_set_nic_info(struct qlcnic_adapter *adapter, |
2230 | struct qlcnic_info *nic) | 2200 | struct qlcnic_info *nic) |
2231 | { | 2201 | { |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h index 66bdcd36f008..a5ca3f460b2d 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | |||
@@ -590,7 +590,6 @@ void qlcnic_83xx_disable_intr(struct qlcnic_adapter *, | |||
590 | struct qlcnic_host_sds_ring *); | 590 | struct qlcnic_host_sds_ring *); |
591 | void qlcnic_83xx_check_vf(struct qlcnic_adapter *, | 591 | void qlcnic_83xx_check_vf(struct qlcnic_adapter *, |
592 | const struct pci_device_id *); | 592 | const struct pci_device_id *); |
593 | int qlcnic_enable_eswitch(struct qlcnic_adapter *, u8, u8); | ||
594 | int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *); | 593 | int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *); |
595 | int qlcnic_83xx_setup_mbx_intr(struct qlcnic_adapter *); | 594 | int qlcnic_83xx_setup_mbx_intr(struct qlcnic_adapter *); |
596 | void qlcnic_83xx_free_mbx_intr(struct qlcnic_adapter *); | 595 | void qlcnic_83xx_free_mbx_intr(struct qlcnic_adapter *); |