diff mbox series

ice: change return type of ice_ptp_request_ts() to s8

Message ID 20210617215419.3502075-1-trix@redhat.com (mailing list archive)
State Not Applicable
Delegated to: Netdev Maintainers
Headers show
Series ice: change return type of ice_ptp_request_ts() to s8 | expand

Checks

Context Check Description
netdev/tree_selection success Guessing tree name failed - patch did not apply

Commit Message

Tom Rix June 17, 2021, 9:54 p.m. UTC 
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(-)

Comments

Tony Nguyen June 17, 2021, 11:25 p.m. UTC | #1 
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
diff mbox series

Patch

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;