[IMPROVE] Buffer: replace get_full_buffers_count() with get_readable_buf_cnt()

Also change dependent functions:
swap_buffer_flush()
driver_to_buffer_flush()

Change-Id: Iee675593df0910bf6bcaa62a7dc9964b2c197c78
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>

diff --git a/buffer/buffer_queue.c b/buffer/buffer_queue.c
index 4e09e09..8d6474b 100644 (file)
--- a/buffer/buffer_queue.c
+++ b/buffer/buffer_queue.c
@@ -535,21 +535,6 @@ int remove_from_busy_list(struct swap_subbuffer *subbuffer)
        return result;
 }
 
-/* Get subbuffers count in read list */
-/* XXX Think about locks */
-int get_full_buffers_count(void)
-{
-       int result = 0;
-       struct swap_subbuffer *buffer = read_queue.start_ptr;
-
-       while (buffer && buffer->full_buffer_part) {
-               result += 1;
-               buffer = buffer->next_in_queue;
-       }
-
-       return result;
-}
-
 /* Set all subbuffers in write list to read list */
 void buffer_queue_flush(void)
 {

diff --git a/buffer/buffer_queue.h b/buffer/buffer_queue.h
index 040b27e..a0833b5 100644 (file)
--- a/buffer/buffer_queue.h
+++ b/buffer/buffer_queue.h
@@ -39,7 +39,6 @@ void add_to_write_list(struct swap_subbuffer *subbuffer);
 void add_to_read_list(struct swap_subbuffer *subbuffer);
 void add_to_busy_list(struct swap_subbuffer *subbuffer);
 int remove_from_busy_list(struct swap_subbuffer *subbuffer);
-int get_full_buffers_count(void);
 
 unsigned int get_readable_buf_cnt(void);
 unsigned int get_writable_buf_cnt(void);

diff --git a/buffer/swap_buffer_module.c b/buffer/swap_buffer_module.c
index e230907..0d228c1 100644 (file)
--- a/buffer/swap_buffer_module.c
+++ b/buffer/swap_buffer_module.c
@@ -250,15 +250,15 @@ int swap_buffer_release(struct swap_subbuffer **subbuffer)
 EXPORT_SYMBOL_GPL(swap_buffer_release);
 
 
-int swap_buffer_flush(void)
+unsigned int swap_buffer_flush(void)
 {
-       int result = 0;
+       unsigned int result;
 
        /* Set all non-empty write buffers to read list */
        buffer_queue_flush();
 
        /* Get count of all full buffers */
-       result = get_full_buffers_count();
+       result = get_readable_buf_cnt();
 
        return result;
 }

diff --git a/buffer/swap_buffer_module.h b/buffer/swap_buffer_module.h
index 4ccb68c..cc70b02 100644 (file)
--- a/buffer/swap_buffer_module.h
+++ b/buffer/swap_buffer_module.h
@@ -70,6 +70,6 @@ int swap_buffer_get(struct swap_subbuffer **subbuffer);
 int swap_buffer_release(struct swap_subbuffer **subbuffer);
 
 /* SWAP Buffer flush. Puts all buffers to read queue and returns their count. */
-int swap_buffer_flush(void);
+unsigned int swap_buffer_flush(void);
 
 #endif /* __SWAP_BUFFER_MODULE_H__ */