From: Arnd Bergmann <arnd@xxxxxxxx>
The prototype for this function changed, but the alternative
implementation needs the same change:
drivers/net/can/dev/bittiming.c: In function 'can_get_bittiming':
drivers/net/can/dev/bittiming.c:145:24: error: too many arguments to function 'can_calc_bittiming'
145 | return can_calc_bittiming(dev, bt, btc, extack);
| ^~~~~~~~~~~~~~~~~~
In file included from include/linux/can/dev.h:18,
from drivers/net/can/dev/bittiming.c:7:
include/linux/can/bittiming.h:126:1: note: declared here
126 | can_calc_bittiming(const struct net_device *dev, struct can_bittiming *bt,
| ^~~~~~~~~~~~~~~~~~
Fixes: 286c0e09e8e0 ("can: bittiming: can_changelink() pass extack down callstack")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
include/linux/can/bittiming.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/can/bittiming.h b/include/linux/can/bittiming.h
index 6cb2ae308e3f..9b8a9c39614b 100644
--- a/include/linux/can/bittiming.h
+++ b/include/linux/can/bittiming.h
@@ -124,7 +124,7 @@ void can_calc_tdco(struct can_tdc *tdc, const struct can_tdc_const *tdc_const,
#else /* !CONFIG_CAN_CALC_BITTIMING */
static inline int
can_calc_bittiming(const struct net_device *dev, struct can_bittiming *bt,
- const struct can_bittiming_const *btc)
+ const struct can_bittiming_const *btc, struct netlink_ext_ack *extack)
{
netdev_err(dev, "bit-timing calculation not available\n");
return -EINVAL;
--
2.39.1
