[RAMEN9610-11292][9610] media: radio: Remove RDS debugging logs, Increase FM_RDS_MEM_...

Change-Id: If0ff07353429238e6cd72360ba38d2ce0b994da1
Signed-off-by: Yunsu Kim <iamyunsu.kim@samsung.com>

diff --git a/drivers/media/radio/s610/fm_low_struc.h b/drivers/media/radio/s610/fm_low_struc.h
index 5106af56aa731149b0e2e637a1a462d2009b40a2..11473e4730b1083f3d4dbc623c14b0001c06f082 100644 (file)
--- a/drivers/media/radio/s610/fm_low_struc.h
+++ b/drivers/media/radio/s610/fm_low_struc.h
@@ -56,7 +56,7 @@ typedef u32 TIME;
 #endif
 
 #define RSSI_REF_ENABLE 0x01
-#define FM_RDS_MEM_SIZE_PARSER 1000
+#define FM_RDS_MEM_SIZE_PARSER 2000
 #define FM_RDS_MEM_SIZE        480
 #define RDS_PARSER_ENABLE 0x04
 #define FM_RADIO_RDS_PARSER_VER_CHECK 0x400

diff --git a/drivers/media/radio/s610/fm_rds.c b/drivers/media/radio/s610/fm_rds.c
index ad96c486a99ff2f1cfec64d3167bc61ea1f8dba0..726edf9e84aa98dcdf43667f4685a94bc089d5dc 100644 (file)
--- a/drivers/media/radio/s610/fm_rds.c
+++ b/drivers/media/radio/s610/fm_rds.c
@@ -154,7 +154,7 @@ void fm_rds_write_data(struct s610_radio *radio,
        u16 usage;
 
        if (ringbuf_is_full(&radio->rds_rb)) {
-               dev_info(radio->dev, "%s():>>>RB full! H[%ld]T[%ld]",
+               RDSEBUG(radio, "%s():>>>RB full! H[%ld]T[%ld]",
                        __func__,
                        (unsigned long) (radio->rds_rb.head - radio->rds_rb.buf),
                        (unsigned long) (radio->rds_rb.tail - radio->rds_rb.buf));
@@ -171,7 +171,7 @@ void fm_rds_write_data(struct s610_radio *radio,
 
        if (!ringbuf_memcpy_into(&radio->rds_rb, buf_ptr, HOST_RDS_BLOCK_SIZE)) {
                usage = ringbuf_bytes_used(&radio->rds_rb);
-               dev_info(radio->dev,
+               RDSEBUG(radio,
                        "%s():>>>RB memcpy into fail! usage:%04d",
                        __func__, ringbuf_bytes_used(&radio->rds_rb));
                if (!usage)
@@ -196,7 +196,7 @@ skip_into_buf:
 
                        if (!(radio->rds_n_count%200)) {
                                fm_update_rssi_work(radio);
-                               dev_info(radio->dev,
+                               RDSEBUG(radio,
                                        ">>>[FM] RSSI[%03d] NCOUNT[%08d] FIFO_ERR[%08d] USAGE[%04d] SYNCLOSS[%08d]",
                                        radio->low->fm_state.rssi, radio->rds_n_count, radio->rds_fifo_err_cnt,
                                        usage, radio->rds_sync_loss_cnt);
@@ -282,7 +282,7 @@ void fm_rds_write_data_remove(struct s610_radio *radio,
        ringbuf_memcpy_remove(&radio->rds_rb,
                (int)removeblock*HOST_RDS_BLOCK_SIZE);
        cur_head = (unsigned long) radio->rds_rb.head;
-       dev_info(radio->dev, ">>> pre-head :%08lX, cur-head :%08lX\n",
+       RDSEBUG(radio, ">>> pre-head :%08lX, cur-head :%08lX\n",
                pre_head, cur_head);
 }
 #else
@@ -315,7 +315,7 @@ int fm_read_rds_data(struct s610_radio *radio, u8 *buffer, int size,
        u16 rsize = size;
 
        if (ringbuf_is_empty(&radio->rds_rb)) {
-               dev_info(radio->dev,
+               RDSEBUG(radio,
                        "%s():>>>RB empty!! H[%04ld]T[%04ld]",
                        __func__,
                        (unsigned long) (radio->rds_rb.head - radio->rds_rb.buf),
@@ -325,7 +325,7 @@ int fm_read_rds_data(struct s610_radio *radio, u8 *buffer, int size,
        }
        radio->rb_used = ringbuf_bytes_used(&radio->rds_rb);
        if (!ringbuf_memcpy_from(buffer, &radio->rds_rb, rsize)) {
-               dev_info(radio->dev,
+               RDSEBUG(radio,
                        "%s():>>>RB memcpy from fail! H[%04ld]T[%04ld]",
                        __func__,
                        (unsigned long) (radio->rds_rb.head - radio->rds_rb.buf),
@@ -536,8 +536,8 @@ static fm_host_rds_errors_enum fm_rds_process_block(
                        fm_rds_parser(pi, data, block_type, error_type);
                        fm_rds_write_data_pi(radio, pi);
                } else {
-               fm_rds_write_data(radio, data, block_type, error_type);
-       }
+                       fm_rds_write_data(radio, data, block_type, error_type);
+               }
        }
 
        return error_type;
@@ -1192,7 +1192,7 @@ void fm_rds_write_data_pi(struct s610_radio *radio,
 
 #ifdef USE_RINGBUFF_API
        if (ringbuf_bytes_free(&radio->rds_rb) < RDS_MEM_MAX_THRESH_PARSER)     {
-               dev_info(radio->dev, ">>> ringbuff not free, wait..");
+               RDSEBUG(radio, ">>> ringbuff not free, wait..");
                /*ringbuf_reset(&radio->rds_rb);*/
                return;
        }
@@ -1289,7 +1289,7 @@ void fm_rds_write_data_pi(struct s610_radio *radio,
 #ifdef USE_RINGBUFF_API
                        if (!ringbuf_memcpy_into(&radio->rds_rb, buf_ptr, total_size)) {
                                usage = ringbuf_bytes_used(&radio->rds_rb);
-                               dev_info(radio->dev,
+                               RDSEBUG(radio,
                                        "%s():>>>RB memcpy into fail! usage:%04d",
                                        __func__, ringbuf_bytes_used(&radio->rds_rb));
                                if (!usage)
@@ -1298,7 +1298,7 @@ void fm_rds_write_data_pi(struct s610_radio *radio,
 
                        usage = ringbuf_bytes_used(&radio->rds_rb);
 #else
-                       dev_info(radio->dev, ">>> ringbuff API not used, fail..");
+                       RDSEBUG(radio, ">>> ringbuff API not used, fail..");
 #endif /* USE_RINGBUFF_API */
 
                        if (atomic_read(&radio->is_rds_new))
@@ -1311,7 +1311,7 @@ void fm_rds_write_data_pi(struct s610_radio *radio,
 
                        if (!(radio->rds_n_count%200)) {
                                fm_update_rssi_work(radio);
-                               dev_info(radio->dev,
+                               RDSEBUG(radio,
                                        ">>>[FM] RSSI[%03d] NCOUNT[%08d] FIFO_ERR[%08d] USAGE[%04d] SYNCLOSS[%08d]",
                                        radio->low->fm_state.rssi, radio->rds_n_count, radio->rds_fifo_err_cnt,
                                        usage, radio->rds_sync_loss_cnt);