From patchwork Wed Feb 8 16:37:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 54492 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3559247wrn; Wed, 8 Feb 2023 08:40:56 -0800 (PST) X-Google-Smtp-Source: AK7set/hekf9F9c7XvfbcsOcWE0KbaBW0JjN8rroUtJ0vP8jPtOJOqrNDqsD82hECId0wdUXLOg5 X-Received: by 2002:a17:90a:f018:b0:230:904a:998e with SMTP id bt24-20020a17090af01800b00230904a998emr7648127pjb.3.1675874455851; Wed, 08 Feb 2023 08:40:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675874455; cv=none; d=google.com; s=arc-20160816; b=pUtm0crqykABDyipMKQoX1E4ZR7xfuY7asYukUCK2BydArqq2HyNOFxYo0XivgawCg 9d5zZl8GzWCQr4PPZCYduYPLj3p5pl6CB/jYbj+5PlYVx8g9MuKXySjk8TfmNwlXNhTZ b/aVkRtL2RPLuJMRIz7hi3McL1ZgOnqzQYuFD9H5SqOOE6opYXIQzy44411OPgwP12qz QrCCv6Jx2glW1EEKscycZL8wQB1eZBnQ7Xu3UZJAkScqRgpDq1Z5PzWubinQH8fQHnJZ gYEtdi0nFqid3/CCAORr4+w7C2+CZICEMOUrNtub7y5XdyPdL4lsIA0XXwSI19TutJR3 HSCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=GxImmaM1a4AW/OIQfphnSUOWIugIte4maSyhHpUU8Bk=; b=B9u/Lp6k3lSE0tiu87IEslnI0oWfw+4+q3rzfqBUqFOlcbjvRz3JegpMEUrV/pmvq+ HBg/8jZY5S7EoJGI76IsTHYvWW31vVyF5TJXt8oDuT6aLCLqeHfFzsJArFl5vI2KPt/z MYJuMukOCIf2euOgu1rd9uXCR7kdTPMC5eCeOvrTwySnweV/cJbKIzF/V6cJoYDryJG6 8xPFoOvvSbdjMfmjeFKQcu5sstnzxwcYGYe3QlVfiXa59Rm4wa3dUXz0ADy0k4Rb/P65 HoVpAZFLiKwfYFGxZkuURow5vus2c51VzU1ZNpVsntdQzySQQyFatV8Lxs1sF5a0oD7e esGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Laq+P8YK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h8-20020a17090acf0800b00219de90bdc5si2514662pju.20.2023.02.08.08.40.43; Wed, 08 Feb 2023 08:40:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Laq+P8YK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbjBHQhv (ORCPT + 99 others); Wed, 8 Feb 2023 11:37:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231334AbjBHQht (ORCPT ); Wed, 8 Feb 2023 11:37:49 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47A6038EAF; Wed, 8 Feb 2023 08:37:30 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D54EF616EE; Wed, 8 Feb 2023 16:37:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D08DEC4339B; Wed, 8 Feb 2023 16:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675874249; bh=GVlTn/Wb5crb4A7aGUaIl+3iY+ZAaM4+XJM7IlFWlSM=; h=From:To:Cc:Subject:Date:From; b=Laq+P8YKAoCSl06pO9O+adebVbm49zvt1gGfskm0kL4BmR8GvEdn7Rw5E4xusCqRk xvtwdxZ3/xZE2l23+ivWgAwAoINRkM/Hnyub41w1o+9sHh15x3nbwiJ2JNE8G+/gCB hwQyzQDLIWixAZ75wUWYZd18F1SezL8jjyoihk6v5DGhtoxb4+Kjt8FmWi+6GuFdHC UbyfdsU0lwUqc81Yel3jabcwHl+zK1F6U/NIBIUQF0w0wKWjoyy/V6lOLu2cmm8sDs 1L7FxPFKPlcttnaOjbLQHzWXkpEkUiotaPP+CF/fM9nHat1BnNFobSAI7oOUzK9CD/ KFQ2Q0GxHYjtg== From: Arnd Bergmann To: Wolfgang Grandegger , Marc Kleine-Budde Cc: Arnd Bergmann , Dario Binacchi , 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 Message-Id: <20230208163726.2154311-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757281733439033047?= X-GMAIL-MSGID: =?utf-8?q?1757281733439033047?= From: Arnd Bergmann 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 --- 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;