Skip to contentSkip to conversation

ice: change return type of ice_ptp_request_ts() to s8

PATCH In review [email protected] 2 participants 2 messages Jun 17, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ice: change return type of ice_ptp_request_ts() to s8

From: Tom Rix <[email protected]>

A gcc 10.3.1 compile error
ice_ptp.h:149:1: error: return type defaults to
'int' [-Werror=return-type]
149 | ice_ptp_request_ts(struct ice_ptp_tx *tx, ...

      | ^~~~~~~~~~~~~~~~~~

This stub's return needs to match the decl for
CONFIG_PTP_I588_CLOCK, which matches its use in
ice_txrt.c

Change the implicit int return to s8.

---
 drivers/net/ethernet/intel/ice/ice_ptp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_ptp.h +1 -1
index 41e14f98f0e66..d01507eba0364 100644
@@ -145,7 +145,7 @@ static inline int ice_get_ptp_clock_index(struct ice_pf *pf)
 	return -1;
 }
 
-static inline
+static inline s8
 ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb)
 {
 	return -1;
Signature · 1 line
2.26.3
#1 lore raw
Quoted 8 lines · trix at redhat.com

From: Tom Rix <[email protected]>

A gcc 10.3.1 compile error
ice_ptp.h:149:1: error: return type defaults to
'int' [-Werror=return-type]
149 | ice_ptp_request_ts(struct ice_ptp_tx *tx, ...

      | ^~~~~~~~~~~~~~~~~~
Quoted 8 lines

This stub's return needs to match the decl for
CONFIG_PTP_I588_CLOCK, which matches its use in
ice_txrt.c

Change the implicit int return to s8.

---

Thanks for the patch Tom, but Lorenzo recently had the fix accepted for this[1].

- Tony

[1] https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-
next.git/commit/?id=4d7f75fe8006a1345e6a52b3e3a4c82633f20564