Commit c6b7314d authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller

net: qed: cleanup global structs declarations

Fix several sparse warnings by moving structs declarations into
the corresponding header files:

drivers/net/ethernet/qlogic/qed/qed_dcbx.c:2402:32: warning:
symbol 'qed_dcbnl_ops_pass' was not declared. Should it be static?

drivers/net/ethernet/qlogic/qed/qed_ll2.c:2754:26: warning: symbol
'qed_ll2_ops_pass' was not declared. Should it be static?

drivers/net/ethernet/qlogic/qed/qed_ptp.c:449:30: warning: symbol
'qed_ptp_ops_pass' was not declared. Should it be static?

drivers/net/ethernet/qlogic/qed/qed_sriov.c:5265:29: warning:
symbol 'qed_iov_ops_pass' was not declared. Should it be static?

(some of them were declared twice in different header files)

Also make qed_hw_err_type_descr[] const while at it.
Signed-off-by: default avatarAlexander Lobakin <alobakin@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0dfda108
...@@ -81,6 +81,8 @@ struct qed_dcbx_mib_meta_data { ...@@ -81,6 +81,8 @@ struct qed_dcbx_mib_meta_data {
u32 addr; u32 addr;
}; };
extern const struct qed_eth_dcbnl_ops qed_dcbnl_ops_pass;
#ifdef CONFIG_DCB #ifdef CONFIG_DCB
int qed_dcbx_get_config_params(struct qed_hwfn *, struct qed_dcbx_set *); int qed_dcbx_get_config_params(struct qed_hwfn *, struct qed_dcbx_set *);
......
...@@ -45,9 +45,4 @@ static inline void qed_get_protocol_stats_fcoe(struct qed_dev *cdev, ...@@ -45,9 +45,4 @@ static inline void qed_get_protocol_stats_fcoe(struct qed_dev *cdev,
} }
#endif /* CONFIG_QED_FCOE */ #endif /* CONFIG_QED_FCOE */
#ifdef CONFIG_QED_LL2
extern const struct qed_common_ops qed_common_ops_pass;
extern const struct qed_ll2_ops qed_ll2_ops_pass;
#endif
#endif /* _QED_FCOE_H */ #endif /* _QED_FCOE_H */
...@@ -26,10 +26,6 @@ struct qed_iscsi_info { ...@@ -26,10 +26,6 @@ struct qed_iscsi_info {
iscsi_event_cb_t event_cb; iscsi_event_cb_t event_cb;
}; };
#ifdef CONFIG_QED_LL2
extern const struct qed_ll2_ops qed_ll2_ops_pass;
#endif
#if IS_ENABLED(CONFIG_QED_ISCSI) #if IS_ENABLED(CONFIG_QED_ISCSI)
int qed_iscsi_alloc(struct qed_hwfn *p_hwfn); int qed_iscsi_alloc(struct qed_hwfn *p_hwfn);
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "qed.h" #include "qed.h"
#include <linux/qed/qed_chain.h> #include <linux/qed/qed_chain.h>
#include "qed_cxt.h" #include "qed_cxt.h"
#include "qed_dcbx.h"
#include "qed_dev_api.h" #include "qed_dev_api.h"
#include <linux/qed/qed_eth_if.h> #include <linux/qed/qed_eth_if.h>
#include "qed_hsi.h" #include "qed_hsi.h"
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
#include "qed_int.h" #include "qed_int.h"
#include "qed_l2.h" #include "qed_l2.h"
#include "qed_mcp.h" #include "qed_mcp.h"
#include "qed_ptp.h"
#include "qed_reg_addr.h" #include "qed_reg_addr.h"
#include "qed_sp.h" #include "qed_sp.h"
#include "qed_sriov.h" #include "qed_sriov.h"
...@@ -2874,16 +2876,6 @@ static int qed_req_bulletin_update_mac(struct qed_dev *cdev, u8 *mac) ...@@ -2874,16 +2876,6 @@ static int qed_req_bulletin_update_mac(struct qed_dev *cdev, u8 *mac)
return 0; return 0;
} }
#ifdef CONFIG_QED_SRIOV
extern const struct qed_iov_hv_ops qed_iov_ops_pass;
#endif
#ifdef CONFIG_DCB
extern const struct qed_eth_dcbnl_ops qed_dcbnl_ops_pass;
#endif
extern const struct qed_eth_ptp_ops qed_ptp_ops_pass;
static const struct qed_eth_ops qed_eth_ops_pass = { static const struct qed_eth_ops qed_eth_ops_pass = {
.common = &qed_common_ops_pass, .common = &qed_common_ops_pass,
#ifdef CONFIG_QED_SRIOV #ifdef CONFIG_QED_SRIOV
......
...@@ -116,6 +116,8 @@ struct qed_ll2_info { ...@@ -116,6 +116,8 @@ struct qed_ll2_info {
struct qed_ll2_cbs cbs; struct qed_ll2_cbs cbs;
}; };
extern const struct qed_ll2_ops qed_ll2_ops_pass;
/** /**
* @brief qed_ll2_acquire_connection - allocate resources, * @brief qed_ll2_acquire_connection - allocate resources,
* starts rx & tx (if relevant) queues pair. Provides * starts rx & tx (if relevant) queues pair. Provides
......
...@@ -2451,7 +2451,7 @@ void qed_schedule_recovery_handler(struct qed_hwfn *p_hwfn) ...@@ -2451,7 +2451,7 @@ void qed_schedule_recovery_handler(struct qed_hwfn *p_hwfn)
ops->schedule_recovery_handler(cookie); ops->schedule_recovery_handler(cookie);
} }
static char *qed_hw_err_type_descr[] = { static const char * const qed_hw_err_type_descr[] = {
[QED_HW_ERR_FAN_FAIL] = "Fan Failure", [QED_HW_ERR_FAN_FAIL] = "Fan Failure",
[QED_HW_ERR_MFW_RESP_FAIL] = "MFW Response Failure", [QED_HW_ERR_MFW_RESP_FAIL] = "MFW Response Failure",
[QED_HW_ERR_HW_ATTN] = "HW Attention", [QED_HW_ERR_HW_ATTN] = "HW Attention",
...@@ -2466,7 +2466,7 @@ void qed_hw_error_occurred(struct qed_hwfn *p_hwfn, ...@@ -2466,7 +2466,7 @@ void qed_hw_error_occurred(struct qed_hwfn *p_hwfn,
{ {
struct qed_common_cb_ops *ops = p_hwfn->cdev->protocol_ops.common; struct qed_common_cb_ops *ops = p_hwfn->cdev->protocol_ops.common;
void *cookie = p_hwfn->cdev->ops_cookie; void *cookie = p_hwfn->cdev->ops_cookie;
char *err_str; const char *err_str;
if (err_type > QED_HW_ERR_LAST) if (err_type > QED_HW_ERR_LAST)
err_type = QED_HW_ERR_LAST; err_type = QED_HW_ERR_LAST;
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "qed_hw.h" #include "qed_hw.h"
#include "qed_l2.h" #include "qed_l2.h"
#include "qed_mcp.h" #include "qed_mcp.h"
#include "qed_ptp.h"
#include "qed_reg_addr.h" #include "qed_reg_addr.h"
/* 16 nano second time quantas to wait before making a Drift adjustment */ /* 16 nano second time quantas to wait before making a Drift adjustment */
......
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
/* Copyright (c) 2020 Marvell International Ltd. */
#ifndef __QED_PTP_H
#define __QED_PTP_H
extern const struct qed_eth_ptp_ops qed_ptp_ops_pass;
#endif /* __QED_PTP_H */
...@@ -246,6 +246,8 @@ enum qed_iov_wq_flag { ...@@ -246,6 +246,8 @@ enum qed_iov_wq_flag {
QED_IOV_WQ_VF_FORCE_LINK_QUERY_FLAG, QED_IOV_WQ_VF_FORCE_LINK_QUERY_FLAG,
}; };
extern const struct qed_iov_hv_ops qed_iov_ops_pass;
#ifdef CONFIG_QED_SRIOV #ifdef CONFIG_QED_SRIOV
/** /**
* @brief Check if given VF ID @vfid is valid * @brief Check if given VF ID @vfid is valid
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment