From: Edward Cree <ecree@solarflare.com>
Date: Tue, 30 Jun 2020 13:13:47 +0100
Subject: sfc: move definition of EFX_MC_STATS_GENERATION_INVALID
Patch-mainline: v5.9-rc1
Git-commit: 20e1026cbed4af3fcf15779ec3edecf990ee8d4e
References: jsc#SLE-16683
Saves a whole #include from nic.c.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/sfc/mcdi_port_common.h | 2 --
drivers/net/ethernet/sfc/nic.c | 1 -
drivers/net/ethernet/sfc/nic_common.h | 2 ++
3 files changed, 2 insertions(+), 3 deletions(-)
--- a/drivers/net/ethernet/sfc/mcdi_port_common.h
+++ b/drivers/net/ethernet/sfc/mcdi_port_common.h
@@ -28,8 +28,6 @@ struct efx_mcdi_phy_data {
u32 forced_cap;
};
-#define EFX_MC_STATS_GENERATION_INVALID ((__force __le64)(-1))
-
int efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_data *cfg);
void efx_link_set_advertising(struct efx_nic *efx,
const unsigned long *advertising);
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -20,7 +20,6 @@
#include "farch_regs.h"
#include "io.h"
#include "workarounds.h"
-#include "mcdi_port_common.h"
#include "mcdi_pcol.h"
/**************************************************************************
--- a/drivers/net/ethernet/sfc/nic_common.h
+++ b/drivers/net/ethernet/sfc/nic_common.h
@@ -263,6 +263,8 @@ void efx_nic_free_buffer(struct efx_nic
size_t efx_nic_get_regs_len(struct efx_nic *efx);
void efx_nic_get_regs(struct efx_nic *efx, void *buf);
+#define EFX_MC_STATS_GENERATION_INVALID ((__force __le64)(-1))
+
size_t efx_nic_describe_stats(const struct efx_hw_stat_desc *desc, size_t count,
const unsigned long *mask, u8 *names);
int efx_nic_copy_stats(struct efx_nic *efx, __le64 *dest);