[PATCH] ice: change return type of ice_ptp_request_ts() to s8

Subsystems: intel ethernet drivers, networking drivers, the rest

STALE1879d

2 messages, 2 authors, 2021-06-17 · open the first message on its own page

[PATCH] ice: change return type of ice_ptp_request_ts() to s8

From: trix@redhat.com
Date: 2021-06-17 21:54:33

From: Tom Rix <trix@redhat.com>

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.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/net/ethernet/intel/ice/ice_ptp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h
index 41e14f98f0e66..d01507eba0364 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.h
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.h
@@ -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;
-- 
2.26.3

Re: [PATCH] ice: change return type of ice_ptp_request_ts() to s8

From: "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>
Date: 2021-06-17 23:25:55

On Thu, 2021-06-17 at 14:54 -0700, trix@redhat.com wrote:
From: Tom Rix <trix@redhat.com>

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.

Signed-off-by: Tom Rix <trix@redhat.com>
---
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help