diff options
| author | David Marchand <david.marchand@redhat.com> | 2023-08-03 11:27:20 +0200 |
|---|---|---|
| committer | David Marchand <david.marchand@redhat.com> | 2023-08-04 14:47:55 +0200 |
| commit | 0767ed979f8116df6af1bc6f20a70f9b7d2a107a (patch) | |
| tree | 458b6a668508c09fd72c99f13f09701f4f63c699 | |
| parent | f78c100bc87119c6a94130a6689d773afdaa9d98 (diff) | |
eal: remove RTE_FUNC_PTR_* deprecated macros
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>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
| -rw-r--r-- | devtools/cocci/func_or_ret.cocci | 12 | ||||
| -rw-r--r-- | doc/guides/rel_notes/deprecation.rst | 4 | ||||
| -rw-r--r-- | doc/guides/rel_notes/release_23_11.rst | 2 | ||||
| -rw-r--r-- | lib/eal/include/rte_dev.h | 13 |
4 files changed, 2 insertions, 29 deletions
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 452f26b5df..317875c505 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -33,10 +33,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 98fc34b5c2..4411bb32c1 100644 --- a/doc/guides/rel_notes/release_23_11.rst +++ b/doc/guides/rel_notes/release_23_11.rst @@ -85,6 +85,8 @@ Removed Items Also, make sure to start the actual text at the margin. ======================================================= +* eal: Removed deprecated ``RTE_FUNC_PTR_OR_*`` macros. + * flow_classify: Removed flow classification library and examples. * kni: Removed the Kernel Network Interface (KNI) library and driver. 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. */ |