[PATCH net-next 0/2] sfc: siena_check_caps fixups

[PATCH net-next 0/2] sfc: siena_check_caps fixups

[Edward Cree]

Fix a bug and a build warning introduced in a recent refactor.

Edward Cree (2):
  sfc: actually wire up siena_check_caps()
  sfc: siena_check_caps() can be static

 drivers/net/ethernet/sfc/siena.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

[PATCH net-next 1/2] sfc: actually wire up siena_check_caps()

[Edward Cree]

Assign it to siena_a0_nic_type.check_caps function pointer.

Fixes: be904b855200 ("sfc: make capability checking a nic_type function")
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
 drivers/net/ethernet/sfc/siena.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index ed1cb6caa69d..d8b052979b1b 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -1093,4 +1093,5 @@ const struct efx_nic_type siena_a0_nic_type = {
 			     1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT |
 			     1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT),
 	.rx_hash_key_size = 16,
+	.check_caps = siena_check_caps,
 };

[PATCH net-next 2/2] sfc: siena_check_caps() can be static

[Edward Cree]

Reported-by: Jakub Kicinski <kuba@kernel.org>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
 drivers/net/ethernet/sfc/siena.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index d8b052979b1b..891e9fb6abec 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -948,8 +948,8 @@ static int siena_mtd_probe(struct efx_nic *efx)
 
 #endif /* CONFIG_SFC_MTD */
 
-unsigned int siena_check_caps(const struct efx_nic *efx,
-			      u8 flag, u32 offset)
+static unsigned int siena_check_caps(const struct efx_nic *efx,
+				     u8 flag, u32 offset)
 {
 	/* Siena did not support MC_CMD_GET_CAPABILITIES */
 	return 0;

Re: [PATCH net-next 0/2] sfc: siena_check_caps fixups

[David Miller]

From: Edward Cree <ecree@solarflare.com>
Date: Tue, 12 May 2020 14:23:03 +0100

> Fix a bug and a build warning introduced in a recent refactor.

Series applied, thanks Ed.