public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@kernel.org>
To: Wolfgang Grandegger <wg@grandegger.com>,
	Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Dario Binacchi <dario.binacchi@amarulasolutions.com>,
	linux-can@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] can: bittiming: fix can_calc_bittiming() dummy helper
Date: Wed,  8 Feb 2023 17:37:12 +0100	[thread overview]
Message-ID: <20230208163726.2154311-1-arnd@kernel.org> (raw)

From: Arnd Bergmann <arnd@arndb.de>

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@arndb.de>
---
 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


             reply	other threads:[~2023-02-08 16:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-08 16:37 Arnd Bergmann [this message]
2023-02-08 20:21 ` [PATCH] can: bittiming: fix can_calc_bittiming() dummy helper Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230208163726.2154311-1-arnd@kernel.org \
    --to=arnd@kernel.org \
    --cc=arnd@arndb.de \
    --cc=dario.binacchi@amarulasolutions.com \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=wg@grandegger.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox