system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-27 21:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qed*: remove version dependency

Browse source 
Inbox drivers don't need versioning scheme in order to guarantee
compatibility, as both qed and qede are compiled from same codebase.

Signed-off-by: Rahul Verma <rahul.verma@qlogic.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rahul Verma 2016-04-10 12:42:59 +03:00 committed by David S. Miller
parent 6c61403dae
commit 95114344ea
7 changed files with 3 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/qlogic/qed/qed.h
View file

@ -507,6 +507,4 @@ u32 qed_unzip_data(struct qed_hwfn *p_hwfn,
int qed_slowpath_irq_req(struct qed_hwfn *hwfn);
#define QED_ETH_INTERFACE_VERSION 300
#endif /* _QED_H */

8
drivers/net/ethernet/qlogic/qed/qed_l2.c
View file

@ -2043,14 +2043,8 @@ static const struct qed_eth_ops qed_eth_ops_pass = {
.get_vport_stats = &qed_get_vport_stats,
};
const struct qed_eth_ops *qed_get_eth_ops(u32 version)
const struct qed_eth_ops *qed_get_eth_ops(void)
{
if (version != QED_ETH_INTERFACE_VERSION) {
pr_notice("Cannot supply ethtool operations [%08x != %08x]\n",
version, QED_ETH_INTERFACE_VERSION);
return NULL;
}
return &qed_eth_ops_pass;
}
EXPORT_SYMBOL(qed_get_eth_ops);

11
drivers/net/ethernet/qlogic/qed/qed_main.c
View file

@ -1172,14 +1172,3 @@ const struct qed_common_ops qed_common_ops_pass = {
.chain_free = &qed_chain_free,
.set_led = &qed_set_led,
};
u32 qed_get_protocol_version(enum qed_protocol protocol)
{
switch (protocol) {
case QED_PROTOCOL_ETH:
return QED_ETH_INTERFACE_VERSION;
default:
return 0;
}
}
EXPORT_SYMBOL(qed_get_protocol_version);

2
drivers/net/ethernet/qlogic/qede/qede.h
View file

@ -32,8 +32,6 @@
__stringify(QEDE_REVISION_VERSION) "." \
__stringify(QEDE_ENGINEERING_VERSION)
#define QEDE_ETH_INTERFACE_VERSION 300
#define DRV_MODULE_SYM qede
struct qede_stats {

11
drivers/net/ethernet/qlogic/qede/qede_main.c
View file

@ -141,19 +141,10 @@ static
int __init qede_init(void)
{
int ret;
u32 qed_ver;
pr_notice("qede_init: %s\n", version);
qed_ver = qed_get_protocol_version(QED_PROTOCOL_ETH);
if (qed_ver != QEDE_ETH_INTERFACE_VERSION) {
pr_notice("Version mismatch [%08x != %08x]\n",
qed_ver,
QEDE_ETH_INTERFACE_VERSION);
return -EINVAL;
}
qed_ops = qed_get_eth_ops(QEDE_ETH_INTERFACE_VERSION);
qed_ops = qed_get_eth_ops();
if (!qed_ops) {
pr_notice("Failed to get qed ethtool operations\n");
return -EINVAL;

2
include/linux/qed/qed_eth_if.h
View file

@ -167,7 +167,7 @@ struct qed_eth_ops {
struct qed_eth_stats *stats);
};
const struct qed_eth_ops *qed_get_eth_ops(u32 version);
const struct qed_eth_ops *qed_get_eth_ops(void);
void qed_put_eth_ops(void);
#endif

9
include/linux/qed/qed_if.h
View file

@ -271,15 +271,6 @@ struct qed_common_ops {
enum qed_led_mode mode);
};
/**
* @brief qed_get_protocol_version
*
* @param protocol
*
* @return version supported by qed for given protocol driver
*/
u32 qed_get_protocol_version(enum qed_protocol protocol);
#define MASK_FIELD(_name, _value) \
((_value) &= (_name ## _MASK))