lib: net_buf: remove deprecated net_buf_put() and net_buf_get() functions
Remove the deprecated net_buf_put() and net_buf_get() functions.
Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 3a4f341..357d6c6 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -105,7 +105,7 @@
Deprecated in this release
==========================
-* Deprecated the :c:func:`net_buf_put` and :c:func:`net_buf_get` API functions in favor of
+* Deprecated the ``net_buf_put()`` and ``net_buf_get()`` API functions in favor of
:c:func:`k_fifo_put` and :c:func:`k_fifo_get`.
* The :ref:`kscan_api` subsystem has been marked as deprecated.
@@ -119,8 +119,6 @@
``include/zephyr/net_buf.h>``. The old header will be removed in future releases
and its usage should be avoided.
-* Deprecated the :c:func:`net_buf_put` and :c:func:`net_buf_get` API functions.
-
Architectures
*************
diff --git a/include/zephyr/net_buf.h b/include/zephyr/net_buf.h
index c349147..c4cc6a7 100644
--- a/include/zephyr/net_buf.h
+++ b/include/zephyr/net_buf.h
@@ -1424,29 +1424,6 @@
#endif
/**
- * @brief Get a buffer from a FIFO.
- *
- * @deprecated Use @a k_fifo_get() instead.
- *
- * @param fifo Which FIFO to take the buffer from.
- * @param timeout Affects the action taken should the FIFO be empty.
- * If K_NO_WAIT, then return immediately. If K_FOREVER, then wait as
- * long as necessary. Otherwise, wait until the specified timeout.
- *
- * @return New buffer or NULL if the FIFO is empty.
- */
-#if defined(CONFIG_NET_BUF_LOG)
-__deprecated struct net_buf * __must_check net_buf_get_debug(struct k_fifo *fifo,
- k_timeout_t timeout,
- const char *func, int line);
-#define net_buf_get(_fifo, _timeout) \
- net_buf_get_debug(_fifo, _timeout, __func__, __LINE__)
-#else
-__deprecated struct net_buf * __must_check net_buf_get(struct k_fifo *fifo,
- k_timeout_t timeout);
-#endif
-
-/**
* @brief Destroy buffer from custom destroy callback
*
* This helper is only intended to be used from custom destroy callbacks.
@@ -1506,16 +1483,6 @@
struct net_buf * __must_check net_buf_slist_get(sys_slist_t *list);
/**
- * @brief Put a buffer to the end of a FIFO.
- *
- * @deprecated Use @a k_fifo_put() instead.
- *
- * @param fifo Which FIFO to put the buffer to.
- * @param buf Buffer.
- */
-__deprecated void net_buf_put(struct k_fifo *fifo, struct net_buf *buf);
-
-/**
* @brief Decrements the reference count of a buffer.
*
* The buffer is put back into the pool if the reference count reaches zero.
diff --git a/lib/net_buf/buf.c b/lib/net_buf/buf.c
index 7b89e89..fc86101 100644
--- a/lib/net_buf/buf.c
+++ b/lib/net_buf/buf.c
@@ -388,27 +388,6 @@
return buf;
}
-#if defined(CONFIG_NET_BUF_LOG)
-struct net_buf *net_buf_get_debug(struct k_fifo *fifo, k_timeout_t timeout,
- const char *func, int line)
-#else
-struct net_buf *net_buf_get(struct k_fifo *fifo, k_timeout_t timeout)
-#endif
-{
- struct net_buf *buf;
-
- NET_BUF_DBG("%s():%d: fifo %p", func, line, fifo);
-
- buf = k_fifo_get(fifo, timeout);
- if (!buf) {
- return NULL;
- }
-
- NET_BUF_DBG("%s():%d: buf %p fifo %p", func, line, buf, fifo);
-
- return buf;
-}
-
static struct k_spinlock net_buf_slist_lock;
void net_buf_slist_put(sys_slist_t *list, struct net_buf *buf)
@@ -439,14 +418,6 @@
return buf;
}
-void net_buf_put(struct k_fifo *fifo, struct net_buf *buf)
-{
- __ASSERT_NO_MSG(fifo);
- __ASSERT_NO_MSG(buf);
-
- k_fifo_put(fifo, buf);
-}
-
#if defined(CONFIG_NET_BUF_LOG)
void net_buf_unref_debug(struct net_buf *buf, const char *func, int line)
#else
