From 74897b69c3e56f8fc96c7760c1c8cd86a002e206 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 7 Dec 2022 14:46:12 +0100 Subject: [PATCH 1/2] can-calc-bit-timing: silence "comparison of integer expressions of different signedness" warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Silence the "comparison of integer expressions of different signedness" warning. We want to compile the code as is from the kernel, including bugs. | calc-bit-timing/can-calc-bit-timing-v2_6_31.c: In function ‘can_update_spt_v2_6_31’: | calc-bit-timing/can-calc-bit-timing-v2_6_31.c:51:13: warning: comparison of integer expressions of different signedness: ‘int’ and ‘__u32’ {aka ‘const unsigned int’} [-Wsign-compare] Fixes: 18eb0ab78449 ("can-calc-bit-timing: import bit timing calculation algorithm from v4.8") Fixes: b777ce2e6dd8 ("can-calc-bit-timing: import bit timing calculation algorithm from v3.18") Fixes: c1f5dc53ec43 ("can-calc-bit-timing: import bit timing calculation algorithm from v2.6.31") Signed-off-by: Marc Kleine-Budde --- calc-bit-timing/can-calc-bit-timing.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/calc-bit-timing/can-calc-bit-timing.c b/calc-bit-timing/can-calc-bit-timing.c index 787a50f..c67f687 100644 --- a/calc-bit-timing/can-calc-bit-timing.c +++ b/calc-bit-timing/can-calc-bit-timing.c @@ -1187,6 +1187,9 @@ static const unsigned int common_data_bitrates[] = { #define CAN_KBPS 1000 #define KILO 1000UL +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wsign-compare" + #define can_update_spt can_update_spt_v2_6_31 #define can_calc_bittiming can_calc_bittiming_v2_6_31 #define can_fixup_bittiming can_fixup_bittiming_v2_6_31 @@ -1211,6 +1214,8 @@ static const unsigned int common_data_bitrates[] = { #undef can_calc_bittiming #undef can_fixup_bittiming +#pragma GCC diagnostic pop + #define can_update_sample_point can_update_sample_point_v5_16 #define can_calc_bittiming can_calc_bittiming_v5_16 #define can_fixup_bittiming can_fixup_bittiming_v5_16 From 0b3112edf2f96d2a43c570274b04a5b7a8d75403 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 7 Dec 2022 14:57:50 +0100 Subject: [PATCH 2/2] can-calc-bit-timing: remove const from printf_btr functions to silence warning on clang Fixes: 9b6392997473 ("can-calc-bit-timing: mark several structs and members as const") Signed-off-by: Marc Kleine-Budde --- calc-bit-timing/can-calc-bit-timing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calc-bit-timing/can-calc-bit-timing.c b/calc-bit-timing/can-calc-bit-timing.c index c67f687..2b53371 100644 --- a/calc-bit-timing/can-calc-bit-timing.c +++ b/calc-bit-timing/can-calc-bit-timing.c @@ -136,8 +136,8 @@ struct calc_bittiming_const { const struct calc_ref_clk ref_clk[16]; - const void (*printf_btr)(struct can_bittiming *bt, bool hdr); - const void (*printf_data_btr)(struct can_bittiming *bt, bool hdr); + void (*printf_btr)(struct can_bittiming *bt, bool hdr); + void (*printf_data_btr)(struct can_bittiming *bt, bool hdr); }; struct alg { @@ -159,7 +159,7 @@ struct alg { struct calc_data { const struct can_bittiming_const *bittiming_const; const struct alg *alg; - const void (*printf_btr)(struct can_bittiming *bt, bool hdr); + void (*printf_btr)(struct can_bittiming *bt, bool hdr); const char *name; const struct calc_ref_clk *ref_clks;