From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Subject: [PATCH] eal: remove RTE_FUNC_PTR_* deprecated macros
Date: Thu, 3 Aug 2023 11:41:18 +0200 [thread overview]
Message-ID: <20230803094118.558955-1-david.marchand@redhat.com> (raw)
The RTE_FUNC_PTR_OR_* macros were marked as deprecated in v22.11, we can
remove them.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
devtools/cocci/func_or_ret.cocci | 12 ------------
doc/guides/rel_notes/deprecation.rst | 4 ----
doc/guides/rel_notes/release_23_11.rst | 2 ++
lib/eal/include/rte_dev.h | 13 -------------
4 files changed, 2 insertions(+), 29 deletions(-)
delete mode 100644 devtools/cocci/func_or_ret.cocci
diff --git a/devtools/cocci/func_or_ret.cocci b/devtools/cocci/func_or_ret.cocci
deleted file mode 100644
index f23d60cc4e..0000000000
--- a/devtools/cocci/func_or_ret.cocci
+++ /dev/null
@@ -1,12 +0,0 @@
-@@
-expression cond, ret;
-@@
--RTE_FUNC_PTR_OR_ERR_RET(cond, ret);
-+if (cond == NULL)
-+ return ret;
-@@
-expression cond;
-@@
--RTE_FUNC_PTR_OR_RET(cond);
-+if (cond == NULL)
-+ return;
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 494b401cda..502dd3a28c 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -51,10 +51,6 @@ Deprecation Notices
are renamed to ``rte_tel_data_add_array_uint`` and ``rte_tel_data_add_dict_uint`` respectively.
As such, the old function names are deprecated and will be removed in a future release.
-* eal: RTE_FUNC_PTR_OR_* macros have been marked deprecated and will be removed
- in the future. Applications can use ``devtools/cocci/func_or_ret.cocci``
- to update their code.
-
* eal: The functions ``rte_thread_setname`` and ``rte_ctrl_thread_create``
are planned to be deprecated starting with the 23.07 release, subject to
the replacement API rte_thread_set_name and rte_thread_create_control being
diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst
index 6b4dd21fd0..f644f03def 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -68,6 +68,8 @@ Removed Items
Also, make sure to start the actual text at the margin.
=======================================================
+* eal: Removed deprecated ``RTE_FUNC_PTR_OR_*`` macros.
+
API Changes
-----------
diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index dc1acc8953..8568535ac0 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -42,19 +42,6 @@ typedef void (*rte_dev_event_cb_fn)(const char *device_name,
enum rte_dev_event_type event,
void *cb_arg);
-/* Macros to check for invalid function pointers */
-#define RTE_FUNC_PTR_OR_ERR_RET(func, retval) RTE_DEPRECATED(RTE_FUNC_PTR_OR_ERR_RET) \
-do { \
- if ((func) == NULL) \
- return retval; \
-} while (0)
-
-#define RTE_FUNC_PTR_OR_RET(func) RTE_DEPRECATED(RTE_FUNC_PTR_OR_RET) \
-do { \
- if ((func) == NULL) \
- return; \
-} while (0)
-
/**
* Device policies.
*/
--
2.41.0
next reply other threads:[~2023-08-03 9:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 9:41 David Marchand [this message]
2023-08-03 9:43 ` Bruce Richardson
2023-08-04 13:02 ` David Marchand
2023-08-03 15:27 ` Morten Brørup
2023-08-03 16:10 ` Tyler Retzlaff
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=20230803094118.558955-1-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
/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).