From patchwork Tue Nov 29 00:05:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Mailhol X-Patchwork-Id: 26987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp23282wrr; Mon, 28 Nov 2022 16:13:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf59LoD8vdMr31gioCt7M9yJNXzhIau2KjSarDYI0TWbujzcmG5GqhOciads5NIUWm+hmWpO X-Received: by 2002:a17:90a:c584:b0:218:eead:25af with SMTP id l4-20020a17090ac58400b00218eead25afmr28170148pjt.45.1669680826872; Mon, 28 Nov 2022 16:13:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669680826; cv=none; d=google.com; s=arc-20160816; b=gm+kvUB9Zv3WRLHm4FiNUpJeqLU7SNRGrskY+jta/i+2hEo86fancKcuOeWc7pfSKn UyDL2PaDyH3S40JMvXYWphHRWXiTq1Ltm0NJgXellV6lUE07wAXJIvwm4zdCpoN0aqc4 Lihmmk23Fg6R3A0LN4FBTLia+1oxnxh7uAiCbtgfkYtrqkYmvNgxAjOz5RomPQvqo5cB 1GFfm4vNCdmcWX8HPhUElpwrrTh3fxyUu5xRLfQqWOfiWJ8joAuhoz8PvMSiLbjFnQIN 6R9CqkBQYQURZgsI/s1DzqIxgTRVOju1yusaRNv+EldSQ3BxtA2FG6GCOkNcFL2PM0Vx vwvw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=JP07mtQeL4FoUwgrGCKcP+kaqfn/uraWOSBYR49R4Wc=; b=xCsrDVZ38s+rNFMfr7nBYunecCvR0Ncru4d8ZOwo7cfNOB9Tzm+sM/WpA7C7hXxiJr ZNaZHn8x4y9+eIba542Ub40e7fNBZgeiWz/DmUSPCl8Oc4s40plcoB/6AkSS9V0PkX6U Zmg5ONE9gWMKU/m+X71u7m8ctlCK2Zb4pvuzcNOuBdFx13iVH3Bg7OdMKiFnwZ06MNrE HWVgonijipVcV78Seu2jFanly9TKB1lwBf3XEdNFUagUsQnbgVXOkZD8gCkX9rEW2H5p wZjC75BoHDgM+87DBEn4b3gBvTo5TgwOQ44eV8+lxJOfCpTi2JmTon2ecTuB+/ypJNo8 7Lxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QP0FrF00; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 21-20020a170902c25500b001898ee9f701si3081963plg.2.2022.11.28.16.13.32; Mon, 28 Nov 2022 16:13:46 -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=@gmail.com header.s=20210112 header.b=QP0FrF00; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234693AbiK2AGv (ORCPT + 99 others); Mon, 28 Nov 2022 19:06:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234863AbiK2AG2 (ORCPT ); Mon, 28 Nov 2022 19:06:28 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A68D93E088; Mon, 28 Nov 2022 16:06:21 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so10568966pjo.3; Mon, 28 Nov 2022 16:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=JP07mtQeL4FoUwgrGCKcP+kaqfn/uraWOSBYR49R4Wc=; b=QP0FrF00rYGSWnRtDLLC6mcFT3uao9tdyTUWzSX7yCexrMQY1Mx8ExO7z3LmdPVjK/ OlUe7lb0UoJxwlvFsi63RKQn2VRlFKdQZhik4OBDog+UQEES/w8FnxRaIaA6dczmvZmG uteN5iF/6kn2Oyjvcr8gjh8slGbw0HEhC/TctpY0BDm+KDAQtJKwPlaemNhFMoTQuQ61 HbImscEFKYBBiPz7wAUBaNtH2jg5QEFYtdA1LCiWx2heqEZX4sb7raH+Oult0/01SYGu twx/y2b6aoe0PTWjJLA0ETW1DUSSfHo9rL6kKcGyXRsyuyqxUQcMnvVOLzcEI1rzSyIM h/BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JP07mtQeL4FoUwgrGCKcP+kaqfn/uraWOSBYR49R4Wc=; b=fEJdAukbZmop9QdYBfioL9q9NG/3/w6po4eE+qAb3yPidUMBwIS5CmfxQ5snwMIW0T UTctAoqZbUdvRC7Ic2HpdmFJ6N59du0IKcJtWxNJeqeRA2KMEdx+OljkqTa8qWZGIeMc b0bOrWu2MYFSxMgYmsa66bm2SPyqQ9b8rpKQAds0r/olGNMBDggq0NZh81flMCY4tK9A OCjPtkIhpT2+AeQ1G3BcRFMeeEHVAW1w4pslMmdE5vGflX6p0Yd25rFoO/lUBmZCjdKV e9L5UiCIc2RsLUB9Gb2KgWYSB4llxCGd//Sbkd1mObMuSFxxY/DrC1ofuUcALENsXPOq HaPg== X-Gm-Message-State: ANoB5plzfIM9KpzUs+TZxhSn3VhtdR6YDboGfrc+dycCmHGEKANRM/tt Uh81T4s/mVmcVXZ+iJ5+iMo= X-Received: by 2002:a17:902:ed94:b0:186:748f:e8c5 with SMTP id e20-20020a170902ed9400b00186748fe8c5mr34531545plj.73.1669680381092; Mon, 28 Nov 2022 16:06:21 -0800 (PST) Received: from XH22050090-L.ad.ts.tri-ad.global ([103.175.111.222]) by smtp.gmail.com with ESMTPSA id r2-20020aa79ec2000000b00572198393c2sm8588147pfq.194.2022.11.28.16.06.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 16:06:20 -0800 (PST) Sender: Vincent Mailhol From: Vincent Mailhol To: Jiri Pirko , netdev@vger.kernel.org, Jakub Kicinski Cc: "David S . Miller" , Eric Dumazet , Paolo Abeni , linux-kernel@vger.kernel.org, Boris Brezillon , Arnaud Ebalard , Srujana Challa , Kurt Kanzenbach , Andrew Lunn , Florian Fainelli , Vladimir Oltean , Michael Chan , Ioana Ciornei , Dimitris Michailidis , Yisen Zhuang , Salil Mehta , Jesse Brandeburg , Tony Nguyen , Sunil Goutham , Linu Cherian , Geetha sowjanya , Jerin Jacob , hariprasad , Subbaraya Sundeep , Taras Chornyi , Saeed Mahameed , Leon Romanovsky , Ido Schimmel , Petr Machata , Simon Horman , Shannon Nelson , drivers@pensando.io, Ariel Elior , Manish Chopra , Jonathan Lemon , Vadim Fedorenko , Richard Cochran , Vadim Pasternak , Shalom Toledo , linux-crypto@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, Jiri Pirko , Herbert Xu , Hao Chen , Guangbin Huang , Minghao Chi , Shijith Thotton , Vincent Mailhol Subject: [PATCH net-next v5 2/4] net: devlink: remove devlink_info_driver_name_put() Date: Tue, 29 Nov 2022 09:05:48 +0900 Message-Id: <20221129000550.3833570-3-mailhol.vincent@wanadoo.fr> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221129000550.3833570-1-mailhol.vincent@wanadoo.fr> References: <20221129000550.3833570-1-mailhol.vincent@wanadoo.fr> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no 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?1750787242563871103?= X-GMAIL-MSGID: =?utf-8?q?1750787242563871103?= Now that the core sets the driver name attribute, drivers are not supposed to call devlink_info_driver_name_put() anymore. Remove it. Signed-off-by: Vincent Mailhol Reviewed-by: Jiri Pirko --- include/net/devlink.h | 2 -- net/core/devlink.c | 11 ++--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/net/devlink.h b/include/net/devlink.h index 074a79b8933f..52d5fb67e9b8 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -1746,8 +1746,6 @@ int devlink_region_snapshot_create(struct devlink_region *region, u8 *data, u32 snapshot_id); int devlink_info_serial_number_put(struct devlink_info_req *req, const char *sn); -int devlink_info_driver_name_put(struct devlink_info_req *req, - const char *name); int devlink_info_board_serial_number_put(struct devlink_info_req *req, const char *bsn); diff --git a/net/core/devlink.c b/net/core/devlink.c index 6478135d9ba1..3babc16eeb6b 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6633,14 +6633,6 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, return err; } -int devlink_info_driver_name_put(struct devlink_info_req *req, const char *name) -{ - if (!req->msg) - return 0; - return nla_put_string(req->msg, DEVLINK_ATTR_INFO_DRIVER_NAME, name); -} -EXPORT_SYMBOL_GPL(devlink_info_driver_name_put); - int devlink_info_serial_number_put(struct devlink_info_req *req, const char *sn) { if (!req->msg) @@ -6756,7 +6748,8 @@ static int devlink_nl_driver_info_get(struct device_driver *drv, return 0; if (drv->name[0]) - return devlink_info_driver_name_put(req, drv->name); + return nla_put_string(req->msg, DEVLINK_ATTR_INFO_DRIVER_NAME, + drv->name); return 0; }