netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
	nicolas.dichtel@6wind.com, donald.hunter@gmail.com,
	jiri@resnulli.us, sdf@google.com,
	Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v3 07/15] tools: ynl-gen: remove unused parse code
Date: Tue, 27 Feb 2024 14:30:24 -0800	[thread overview]
Message-ID: <20240227223032.1835527-8-kuba@kernel.org> (raw)
In-Reply-To: <20240227223032.1835527-1-kuba@kernel.org>

Commit f2ba1e5e2208 ("tools: ynl-gen: stop generating common notification handlers")
removed the last caller of the parse_cb_run() helper.
We no longer need to export ynl_cb_array.

Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 tools/net/ynl/lib/ynl-priv.h | 2 --
 tools/net/ynl/lib/ynl.c      | 2 +-
 tools/net/ynl/ynl-gen-c.py   | 8 --------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/tools/net/ynl/lib/ynl-priv.h b/tools/net/ynl/lib/ynl-priv.h
index c44b53c8d084..ef16fcbd9f68 100644
--- a/tools/net/ynl/lib/ynl-priv.h
+++ b/tools/net/ynl/lib/ynl-priv.h
@@ -83,8 +83,6 @@ struct ynl_ntf_base_type {
 	unsigned char data[] __attribute__((aligned(8)));
 };
 
-extern mnl_cb_t ynl_cb_array[NLMSG_MIN_TYPE];
-
 struct nlmsghdr *
 ynl_gemsg_start_req(struct ynl_sock *ys, __u32 id, __u8 cmd, __u8 version);
 struct nlmsghdr *
diff --git a/tools/net/ynl/lib/ynl.c b/tools/net/ynl/lib/ynl.c
index 88456c7bb1ec..ad77ce6a1128 100644
--- a/tools/net/ynl/lib/ynl.c
+++ b/tools/net/ynl/lib/ynl.c
@@ -297,7 +297,7 @@ static int ynl_cb_noop(const struct nlmsghdr *nlh, void *data)
 	return MNL_CB_OK;
 }
 
-mnl_cb_t ynl_cb_array[NLMSG_MIN_TYPE] = {
+static mnl_cb_t ynl_cb_array[NLMSG_MIN_TYPE] = {
 	[NLMSG_NOOP]	= ynl_cb_noop,
 	[NLMSG_ERROR]	= ynl_cb_error,
 	[NLMSG_DONE]	= ynl_cb_done,
diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
index 6f57c9f00e7a..289a04f2cfaa 100755
--- a/tools/net/ynl/ynl-gen-c.py
+++ b/tools/net/ynl/ynl-gen-c.py
@@ -40,14 +40,6 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S
     def get_family_id(self):
         return 'ys->family_id'
 
-    def parse_cb_run(self, cb, data, is_dump=False, indent=1):
-        ind = '\n\t\t' + '\t' * indent + ' '
-        if is_dump:
-            return f"mnl_cb_run2(ys->rx_buf, len, 0, 0, {cb}, {data},{ind}ynl_cb_array, NLMSG_MIN_TYPE)"
-        else:
-            return f"mnl_cb_run2(ys->rx_buf, len, ys->seq, ys->portid,{ind}{cb}, {data},{ind}" + \
-                   "ynl_cb_array, NLMSG_MIN_TYPE)"
-
 
 class Type(SpecAttr):
     def __init__(self, family, attr_set, attr, value):
-- 
2.43.2


  parent reply	other threads:[~2024-02-27 22:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-27 22:30 [PATCH net-next v3 00/15] tools: ynl: stop using libmnl Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 01/15] tools: ynl: give up on libmnl for auto-ints Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 02/15] tools: ynl: create local attribute helpers Jakub Kicinski
2024-02-28  8:21   ` Nicolas Dichtel
2024-02-27 22:30 ` [PATCH net-next v3 03/15] tools: ynl: create local for_each helpers Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 04/15] tools: ynl: create local nlmsg access helpers Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 05/15] tools: ynl: create local ARRAY_SIZE() helper Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 06/15] tools: ynl: make yarg the first member of struct ynl_dump_state Jakub Kicinski
2024-02-27 22:30 ` Jakub Kicinski [this message]
2024-02-27 22:30 ` [PATCH net-next v3 08/15] tools: ynl: wrap recv() + mnl_cb_run2() into a single helper Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 09/15] tools: ynl: use ynl_sock_read_msgs() for ACK handling Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 10/15] tools: ynl: stop using mnl_cb_run2() Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 11/15] tools: ynl: switch away from mnl_cb_t Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 12/15] tools: ynl: switch away from MNL_CB_* Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 13/15] tools: ynl: stop using mnl socket helpers Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 14/15] tools: ynl: remove the libmnl dependency Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 15/15] tools: ynl: use MSG_DONTWAIT for getting notifications Jakub Kicinski
2024-02-28 23:50 ` [PATCH net-next v3 00/15] tools: ynl: stop using libmnl patchwork-bot+netdevbpf

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=20240227223032.1835527-8-kuba@kernel.org \
    --to=kuba@kernel.org \
    --cc=davem@davemloft.net \
    --cc=donald.hunter@gmail.com \
    --cc=edumazet@google.com \
    --cc=jiri@resnulli.us \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.dichtel@6wind.com \
    --cc=pabeni@redhat.com \
    --cc=sdf@google.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;
as well as URLs for NNTP newsgroup(s).