ENGR00318773-2 mxc: asrc: Abstract a helper function for duplicated wait_for_compeltion code

After dropping the extra task for last period buffer fetching, we have a total
symmetrical wait_for_compeltion here so it's better to abstract a function to
make the driver neat.

Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>

1 files changed, 19 insertions, 20 deletions

diff --git a/drivers/mxc/asrc/mxc_asrc.c b/drivers/mxc/asrc/mxc_asrc.c
index 4c198fc46738..c8a7246fbc9b 100644
--- a/drivers/mxc/asrc/mxc_asrc.c
+++ b/drivers/mxc/asrc/mxc_asrc.c
@@ -999,7 +999,6 @@ int mxc_asrc_process_io_buffer(struct asrc_pair_params *params,
 {
         void *last_vaddr = params->output_last_period.dma_vaddr;
         unsigned int *last_len = &params->output_last_period.length;
-        enum asrc_pair_index index = params->index;
         unsigned int dma_len, *buf_len;
         struct completion *complete;
         unsigned long lock_flags;
@@ -1044,16 +1043,9 @@ int mxc_asrc_process_io_buffer(struct asrc_pair_params *params,
         return 0;
 }
 
-int mxc_asrc_process_buffer(struct asrc_pair_params *params,
-                        struct asrc_convert_buffer *pbuf)
+int mxc_asrc_process_buffer_pre(struct completion *complete,
+                                enum asrc_pair_index index, bool in)
 {
-        enum asrc_pair_index index = params->index;
-        struct completion *complete;
-        int ret;
-        bool in;
-
-        complete = &params->output_complete;
-        in = false;
         if (!wait_for_completion_interruptible_timeout(complete, 10 * HZ)) {
                 pair_err("%sput dma task timeout\n", in ? "in" : "out");
                 return -ETIME;
@@ -1064,17 +1056,24 @@ int mxc_asrc_process_buffer(struct asrc_pair_params *params,
 
         init_completion(complete);
 
-        complete = &params->input_complete;
-        in = true;
-        if (!wait_for_completion_interruptible_timeout(complete, 10 * HZ)) {
-                pair_err("%sput dma task timeout\n", in ? "in" : "out");
-                return -ETIME;
-        } else if (signal_pending(current)) {
-                pair_err("%sput task forcibly aborted\n", in ? "in" : "out");
-                return -ERESTARTSYS;
-        }
+        return 0;
+}
 
-        init_completion(complete);
+int mxc_asrc_process_buffer(struct asrc_pair_params *params,
+                        struct asrc_convert_buffer *pbuf)
+{
+        enum asrc_pair_index index = params->index;
+        int ret;
+
+        /* Ouput task should be finished earilier */
+        ret = mxc_asrc_process_buffer_pre(&params->output_complete, index, false);
+        if (ret)
+                return ret;
+
+        /* ...then input task*/
+        ret = mxc_asrc_process_buffer_pre(&params->input_complete, index, true);
+        if (ret)
+                return ret;
 
         ret = mxc_asrc_process_io_buffer(params, pbuf, true);
         if (ret) {