can: bittiming: fix can_calc_bittiming() dummy helper
PATCH 1/1 can: bittiming: fix can_calc_bittiming() dummy helper
From: Arnd Bergmann <[email protected]>
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,
| ^~~~~~~~~~~~~~~~~~
--- include/linux/can/bittiming.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/can/bittiming.h +1 -1
@@ -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 ;
Signature · 1 line
2.39.1
Marc Kleine-Budde
maintainerQuoted 4 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The prototype for this function changed, but the alternative implementation needs the same change:
ACK - I've posted this fix this morning already.
| https://lore.kernel.org/all/[email protected]/
Will send a PR now, before this annoys more people :)
regards,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |