remove tu_fifo_discard_n() and its usage

3 files changed, 3 insertions, 22 deletions

diff --git a/src/common/tusb_fifo.c b/src/common/tusb_fifo.c
index 1313fc328..1fca1fd32 100644
--- a/src/common/tusb_fifo.c
+++ b/src/common/tusb_fifo.c
@@ -450,15 +450,6 @@ uint16_t tu_fifo_write_n_access_mode(tu_fifo_t *f, const void *data, uint16_t n,
   return n;
 }
 
-uint16_t tu_fifo_discard_n(tu_fifo_t *f, uint16_t n) {
-  const uint16_t count = tu_min16(n, tu_fifo_count(f)); // limit to available count
-  ff_lock(f->mutex_rd);
-  f->rd_idx = advance_index(f->depth, f->rd_idx, count);
-  ff_unlock(f->mutex_rd);
-
-  return count;
-}
-
 //--------------------------------------------------------------------+
 // One API
 //--------------------------------------------------------------------+
diff --git a/src/common/tusb_fifo.h b/src/common/tusb_fifo.h
index 5bc05b56c..26ac38073 100644
--- a/src/common/tusb_fifo.h
+++ b/src/common/tusb_fifo.h
@@ -205,10 +205,6 @@ TU_ATTR_ALWAYS_INLINE static inline uint16_t tu_fifo_read_n(tu_fifo_t *f, void *
   return tu_fifo_read_n_access_mode(f, buffer, n, TU_FIFO_INC_ADDR_RW8);
 }
 
-// discard first n items from fifo i.e advance read pointer by n with mutex
-// return number of discarded items
-uint16_t tu_fifo_discard_n(tu_fifo_t *f, uint16_t n);
-
 //--------------------------------------------------------------------+
 // Write API
 //--------------------------------------------------------------------+
diff --git a/src/common/tusb_private.h b/src/common/tusb_private.h
index df518d5ff..dc62ae848 100644
--- a/src/common/tusb_private.h
+++ b/src/common/tusb_private.h
@@ -172,17 +172,15 @@ uint32_t tu_edpt_stream_read_xfer(uint8_t hwid, tu_edpt_stream_t* s);
 // Complete read transfer by writing EP -> FIFO. Must be called in the transfer complete callback
 TU_ATTR_ALWAYS_INLINE static inline
 void tu_edpt_stream_read_xfer_complete(tu_edpt_stream_t* s, uint32_t xferred_bytes) {
-  if (0u != tu_fifo_depth(&s->ff) && s->ep_buf != NULL) {
-    tu_fifo_write_n(&s->ff, s->ep_buf, (uint16_t) xferred_bytes);
+  if (s->ep_buf != NULL) {
+    tu_fifo_write_n(&s->ff, s->ep_buf, (uint16_t)xferred_bytes);
   }
 }
 
 // Complete read transfer with provided buffer
 TU_ATTR_ALWAYS_INLINE static inline
 void tu_edpt_stream_read_xfer_complete_with_buf(tu_edpt_stream_t *s, const void *buf, uint32_t xferred_bytes) {
-  if (0u != tu_fifo_depth(&s->ff)) {
-    tu_fifo_write_n(&s->ff, buf, (uint16_t) xferred_bytes);
-  }
+  tu_fifo_write_n(&s->ff, buf, (uint16_t)xferred_bytes);
 }
 
 // Get the number of bytes available for reading
@@ -194,10 +192,6 @@ TU_ATTR_ALWAYS_INLINE static inline bool tu_edpt_stream_peek(tu_edpt_stream_t *s
   return tu_fifo_peek(&s->ff, ch);
 }
 
-TU_ATTR_ALWAYS_INLINE static inline uint32_t tu_edpt_stream_discard(tu_edpt_stream_t *s, uint32_t len) {
-  return (uint32_t)tu_fifo_discard_n(&s->ff, (uint16_t)len);
-}
-
 #ifdef __cplusplus
  }
 #endif