MFC r291395

sfxge: cleanup: fix prefast annotations for stats buffers

Submitted by:   Andy Moreton <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.

11 files changed, 15 insertions, 15 deletions

diff --git a/sys/dev/sfxge/common/efx.h b/sys/dev/sfxge/common/efx.h
index 3435951..7ffb295e 100644
--- a/sys/dev/sfxge/common/efx.h
+++ b/sys/dev/sfxge/common/efx.h
@@ -688,7 +688,7 @@ extern	__checkReturn			int
 efx_mon_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values);
+	__inout_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values);
 
 #endif	/* EFSYS_OPT_MON_STATS */
 
@@ -946,7 +946,7 @@ extern	__checkReturn			int
 efx_phy_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_PHY_NSTATS)	uint32_t *stat);
+	__inout_ecount(EFX_PHY_NSTATS)	uint32_t *stat);
 
 #endif	/* EFSYS_OPT_PHY_STATS */
 
diff --git a/sys/dev/sfxge/common/efx_mon.c b/sys/dev/sfxge/common/efx_mon.c
index c5b356d..5fcd757 100644
--- a/sys/dev/sfxge/common/efx_mon.c
+++ b/sys/dev/sfxge/common/efx_mon.c
@@ -307,7 +307,7 @@ efx_mon_stat_name(
 efx_mon_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values)
+	__inout_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values)
 {
 	efx_mon_t *emp = &(enp->en_mon);
 	efx_mon_ops_t *emop = emp->em_emop;
diff --git a/sys/dev/sfxge/common/efx_phy.c b/sys/dev/sfxge/common/efx_phy.c
index 5d18dc7..1f4a949 100644
--- a/sys/dev/sfxge/common/efx_phy.c
+++ b/sys/dev/sfxge/common/efx_phy.c
@@ -631,7 +631,7 @@ efx_phy_stat_name(
 efx_phy_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_PHY_NSTATS)	uint32_t *stat)
+	__inout_ecount(EFX_PHY_NSTATS)	uint32_t *stat)
 {
 	efx_port_t *epp = &(enp->en_port);
 	efx_phy_ops_t *epop = epp->ep_epop;
diff --git a/sys/dev/sfxge/common/hunt_impl.h b/sys/dev/sfxge/common/hunt_impl.h
index 0aa4ae5..a682e21 100644
--- a/sys/dev/sfxge/common/hunt_impl.h
+++ b/sys/dev/sfxge/common/hunt_impl.h
@@ -236,7 +236,7 @@ extern	__checkReturn			int
 hunt_mac_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
+	__inout_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
 	__out_opt			uint32_t *generationp);
 
 #endif	/* EFSYS_OPT_MAC_STATS */
@@ -485,7 +485,7 @@ extern	__checkReturn			int
 hunt_phy_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_PHY_NSTATS)	uint32_t *stat);
+	__inout_ecount(EFX_PHY_NSTATS)	uint32_t *stat);
 
 #endif	/* EFSYS_OPT_PHY_STATS */
 
diff --git a/sys/dev/sfxge/common/hunt_mac.c b/sys/dev/sfxge/common/hunt_mac.c
index ebe04be..813729a 100644
--- a/sys/dev/sfxge/common/hunt_mac.c
+++ b/sys/dev/sfxge/common/hunt_mac.c
@@ -371,7 +371,7 @@ fail1:
 hunt_mac_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
+	__inout_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
 	__out_opt			uint32_t *generationp)
 {
 	efx_qword_t value;
diff --git a/sys/dev/sfxge/common/hunt_phy.c b/sys/dev/sfxge/common/hunt_phy.c
index 1cffea2..3de4ba5 100644
--- a/sys/dev/sfxge/common/hunt_phy.c
+++ b/sys/dev/sfxge/common/hunt_phy.c
@@ -495,7 +495,7 @@ hunt_phy_oui_get(
 hunt_phy_stats_update(
 	__in					efx_nic_t *enp,
 	__in					efsys_mem_t *esmp,
-	__out_ecount(EFX_PHY_NSTATS)		uint32_t *stat)
+	__inout_ecount(EFX_PHY_NSTATS)		uint32_t *stat)
 {
 	/* TBD: no stats support in firmware yet */
 	_NOTE(ARGUNUSED(enp, esmp))
diff --git a/sys/dev/sfxge/common/mcdi_mon.c b/sys/dev/sfxge/common/mcdi_mon.c
index ec692be..03b85ac 100644
--- a/sys/dev/sfxge/common/mcdi_mon.c
+++ b/sys/dev/sfxge/common/mcdi_mon.c
@@ -162,7 +162,7 @@ mcdi_mon_decode_stats(
 	__in					size_t sensor_mask_size,
 	__in_opt				efsys_mem_t *esmp,
 	__out_ecount_opt(sensor_mask_size)	uint32_t *stat_maskp,
-	__out_ecount_opt(EFX_MON_NSTATS)	efx_mon_stat_value_t *stat)
+	__inout_ecount_opt(EFX_MON_NSTATS)	efx_mon_stat_value_t *stat)
 {
 	efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
 	uint16_t port_mask;
@@ -435,7 +435,7 @@ fail1:
 mcdi_mon_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values)
+	__inout_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values)
 {
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
 	uint32_t size = encp->enc_mon_stat_dma_buf_size;
diff --git a/sys/dev/sfxge/common/mcdi_mon.h b/sys/dev/sfxge/common/mcdi_mon.h
index 30bb150..f948852 100644
--- a/sys/dev/sfxge/common/mcdi_mon.h
+++ b/sys/dev/sfxge/common/mcdi_mon.h
@@ -63,7 +63,7 @@ extern	__checkReturn			int
 mcdi_mon_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values);
+	__inout_ecount(EFX_MON_NSTATS)	efx_mon_stat_value_t *values);
 
 #endif	/* EFSYS_OPT_MON_STATS */
 
diff --git a/sys/dev/sfxge/common/siena_impl.h b/sys/dev/sfxge/common/siena_impl.h
index b65e399..d7cc52c 100644
--- a/sys/dev/sfxge/common/siena_impl.h
+++ b/sys/dev/sfxge/common/siena_impl.h
@@ -472,7 +472,7 @@ extern	__checkReturn			int
 siena_mac_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
+	__inout_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
 	__out_opt			uint32_t *generationp);
 
 #endif	/* EFSYS_OPT_MAC_STATS */
diff --git a/sys/dev/sfxge/common/siena_mac.c b/sys/dev/sfxge/common/siena_mac.c
index beeaea1..f29e68c 100644
--- a/sys/dev/sfxge/common/siena_mac.c
+++ b/sys/dev/sfxge/common/siena_mac.c
@@ -234,7 +234,7 @@ fail1:
 siena_mac_stats_update(
 	__in				efx_nic_t *enp,
 	__in				efsys_mem_t *esmp,
-	__out_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
+	__inout_ecount(EFX_MAC_NSTATS)	efsys_stat_t *stat,
 	__out_opt			uint32_t *generationp)
 {
 	efx_qword_t value;
diff --git a/sys/dev/sfxge/common/siena_phy.c b/sys/dev/sfxge/common/siena_phy.c
index fd0871d..94485ea 100644
--- a/sys/dev/sfxge/common/siena_phy.c
+++ b/sys/dev/sfxge/common/siena_phy.c
@@ -466,7 +466,7 @@ siena_phy_decode_stats(
 	__in					uint32_t vmask,
 	__in_opt				efsys_mem_t *esmp,
 	__out_opt				uint64_t *smaskp,
-	__out_ecount_opt(EFX_PHY_NSTATS)	uint32_t *stat)
+	__inout_ecount_opt(EFX_PHY_NSTATS)	uint32_t *stat)
 {
 	uint64_t smask = 0;
 
@@ -550,7 +550,7 @@ siena_phy_decode_stats(
 siena_phy_stats_update(
 	__in					efx_nic_t *enp,
 	__in					efsys_mem_t *esmp,
-	__out_ecount(EFX_PHY_NSTATS)		uint32_t *stat)
+	__inout_ecount(EFX_PHY_NSTATS)		uint32_t *stat)
 {
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
 	uint32_t vmask = encp->enc_mcdi_phy_stat_mask;