diff mbox series

[-next,v3] media: staging: atomisp: use list_splice_init in atomisp_compat_css20.c

Message ID 20210611081004.1348026-1-libaokun1@huawei.com
State Superseded
Headers show
Series [-next,v3] media: staging: atomisp: use list_splice_init in atomisp_compat_css20.c | expand

Commit Message

libaokun (A) June 11, 2021, 8:10 a.m. UTC
Using list_splice_init() instead of entire while-loops
in atomisp_compat_css20.c.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Baokun Li <libaokun1@huawei.com>
---
V1->V2:
	CC mailist
V2->V3:
        Using list_move_tail() -> Using list_splice_init()

 .../media/atomisp/pci/atomisp_compat_css20.c  | 35 +++----------------
 1 file changed, 5 insertions(+), 30 deletions(-)

Comments

Andy Shevchenko June 11, 2021, 9:59 a.m. UTC | #1
On Fri, Jun 11, 2021 at 04:10:04PM +0800, Baokun Li wrote:
> Using list_splice_init() instead of entire while-loops
> in atomisp_compat_css20.c.

Seems fine to me.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Baokun Li <libaokun1@huawei.com>
> ---
> V1->V2:
> 	CC mailist
> V2->V3:
>         Using list_move_tail() -> Using list_splice_init()
> 
>  .../media/atomisp/pci/atomisp_compat_css20.c  | 35 +++----------------
>  1 file changed, 5 insertions(+), 30 deletions(-)
> 
> diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
> index f60198bb8a1a..3844180d32b5 100644
> --- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
> +++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
> @@ -2144,42 +2144,17 @@ void atomisp_css_stop(struct atomisp_sub_device *asd,
>  	}
>  
>  	/* move stats buffers to free queue list */
> -	while (!list_empty(&asd->s3a_stats_in_css)) {
> -		s3a_buf = list_entry(asd->s3a_stats_in_css.next,
> -				     struct atomisp_s3a_buf, list);
> -		list_del(&s3a_buf->list);
> -		list_add_tail(&s3a_buf->list, &asd->s3a_stats);
> -	}
> -	while (!list_empty(&asd->s3a_stats_ready)) {
> -		s3a_buf = list_entry(asd->s3a_stats_ready.next,
> -				     struct atomisp_s3a_buf, list);
> -		list_del(&s3a_buf->list);
> -		list_add_tail(&s3a_buf->list, &asd->s3a_stats);
> -	}
> +	list_splice_init(&asd->s3a_stats_in_css, &asd->s3a_stats);
> +	list_splice_init(&asd->s3a_stats_ready, &asd->s3a_stats);
>  
>  	spin_lock_irqsave(&asd->dis_stats_lock, irqflags);
> -	while (!list_empty(&asd->dis_stats_in_css)) {
> -		dis_buf = list_entry(asd->dis_stats_in_css.next,
> -				     struct atomisp_dis_buf, list);
> -		list_del(&dis_buf->list);
> -		list_add_tail(&dis_buf->list, &asd->dis_stats);
> -	}
> +	list_splice_init(&asd->dis_stats_in_css, &asd->dis_stats);
>  	asd->params.dis_proj_data_valid = false;
>  	spin_unlock_irqrestore(&asd->dis_stats_lock, irqflags);
>  
>  	for (i = 0; i < ATOMISP_METADATA_TYPE_NUM; i++) {
> -		while (!list_empty(&asd->metadata_in_css[i])) {
> -			md_buf = list_entry(asd->metadata_in_css[i].next,
> -					    struct atomisp_metadata_buf, list);
> -			list_del(&md_buf->list);
> -			list_add_tail(&md_buf->list, &asd->metadata[i]);
> -		}
> -		while (!list_empty(&asd->metadata_ready[i])) {
> -			md_buf = list_entry(asd->metadata_ready[i].next,
> -					    struct atomisp_metadata_buf, list);
> -			list_del(&md_buf->list);
> -			list_add_tail(&md_buf->list, &asd->metadata[i]);
> -		}
> +		list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);
> +		list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);
>  	}
>  
>  	atomisp_flush_params_queue(&asd->video_out_capture);
> -- 
> 2.31.1
>
kernel test robot June 17, 2021, 8:52 a.m. UTC | #2
Hi Baokun,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on next-20210616]

url:    https://github.com/0day-ci/linux/commits/Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443
base:    c7d4c1fd91ab4a6d2620497921a9c6bf54650ab8
config: i386-allyesconfig (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
        # https://github.com/0day-ci/linux/commit/05c714d7b4e1722a75f949e40c5305f3ba28d048
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443
        git checkout 05c714d7b4e1722a75f949e40c5305f3ba28d048
        # save the attached .config to linux build tree
        make W=1 ARCH=i386 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function 'atomisp_css_stop':
>> drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2156:50: error: 'struct atomisp_sub_device' has no member named 'asd'

    2156 |   list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);
         |                                                  ^~
   drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2157:49: error: 'struct atomisp_sub_device' has no member named 'asd'
    2157 |   list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);
         |                                                 ^~
   drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2107:31: warning: unused variable 'md_buf' [-Wunused-variable]
    2107 |  struct atomisp_metadata_buf *md_buf;
         |                               ^~~~~~
   drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2106:26: warning: unused variable 'dis_buf' [-Wunused-variable]
    2106 |  struct atomisp_dis_buf *dis_buf;
         |                          ^~~~~~~
   drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2105:26: warning: unused variable 's3a_buf' [-Wunused-variable]
    2105 |  struct atomisp_s3a_buf *s3a_buf;
         |                          ^~~~~~~


vim +2156 drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

  2100	
  2101	void atomisp_css_stop(struct atomisp_sub_device *asd,
  2102			      enum ia_css_pipe_id pipe_id, bool in_reset)
  2103	{
  2104		struct atomisp_device *isp = asd->isp;
  2105		struct atomisp_s3a_buf *s3a_buf;
  2106		struct atomisp_dis_buf *dis_buf;
  2107		struct atomisp_metadata_buf *md_buf;
  2108		unsigned long irqflags;
  2109		unsigned int i;
  2110	
  2111		/* if is called in atomisp_reset(), force destroy stream */
  2112		if (__destroy_streams(asd, true))
  2113			dev_err(isp->dev, "destroy stream failed.\n");
  2114	
  2115		/* if is called in atomisp_reset(), force destroy all pipes */
  2116		if (__destroy_pipes(asd, true))
  2117			dev_err(isp->dev, "destroy pipes failed.\n");
  2118	
  2119		atomisp_init_raw_buffer_bitmap(asd);
  2120	
  2121		/*
  2122		 * SP can not be stop if other streams are in use
  2123		 */
  2124		if (atomisp_streaming_count(isp) == 0)
  2125			ia_css_stop_sp();
  2126	
  2127		if (!in_reset) {
  2128			struct atomisp_stream_env *stream_env;
  2129			int i, j;
  2130	
  2131			for (i = 0; i < ATOMISP_INPUT_STREAM_NUM; i++) {
  2132				stream_env = &asd->stream_env[i];
  2133				for (j = 0; j < IA_CSS_PIPE_ID_NUM; j++) {
  2134					ia_css_pipe_config_defaults(
  2135					    &stream_env->pipe_configs[j]);
  2136					ia_css_pipe_extra_config_defaults(
  2137					    &stream_env->pipe_extra_configs[j]);
  2138				}
  2139				ia_css_stream_config_defaults(
  2140				    &stream_env->stream_config);
  2141			}
  2142			memset(&asd->params.config, 0, sizeof(asd->params.config));
  2143			asd->params.css_update_params_needed = false;
  2144		}
  2145	
  2146		/* move stats buffers to free queue list */
  2147		list_splice_init(&asd->s3a_stats_in_css, &asd->s3a_stats);
  2148		list_splice_init(&asd->s3a_stats_ready, &asd->s3a_stats);
  2149	
  2150		spin_lock_irqsave(&asd->dis_stats_lock, irqflags);
  2151		list_splice_init(&asd->dis_stats_in_css, &asd->dis_stats);
  2152		asd->params.dis_proj_data_valid = false;
  2153		spin_unlock_irqrestore(&asd->dis_stats_lock, irqflags);
  2154	
  2155		for (i = 0; i < ATOMISP_METADATA_TYPE_NUM; i++) {
> 2156			list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);

  2157			list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);
  2158		}
  2159	
  2160		atomisp_flush_params_queue(&asd->video_out_capture);
  2161		atomisp_flush_params_queue(&asd->video_out_vf);
  2162		atomisp_flush_params_queue(&asd->video_out_preview);
  2163		atomisp_flush_params_queue(&asd->video_out_video_capture);
  2164		atomisp_free_css_parameters(&asd->params.css_param);
  2165		memset(&asd->params.css_param, 0, sizeof(asd->params.css_param));
  2166	}
  2167	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
libaokun (A) June 17, 2021, 12:14 p.m. UTC | #3
Sorry, I only tested it with 'x86_64.config'.

I'm about to send a patch v4 with the changes to fix the error under 
your config.

Best Regards.


在 2021/6/17 16:52, kernel test robot 写道:
> Hi Baokun,

>

> Thank you for the patch! Yet something to improve:

>

> [auto build test ERROR on next-20210616]

>

> url:    https://github.com/0day-ci/linux/commits/Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443

> base:    c7d4c1fd91ab4a6d2620497921a9c6bf54650ab8

> config: i386-allyesconfig (attached as .config)

> compiler: gcc-9 (Debian 9.3.0-22) 9.3.0

> reproduce (this is a W=1 build):

>          # https://github.com/0day-ci/linux/commit/05c714d7b4e1722a75f949e40c5305f3ba28d048

>          git remote add linux-review https://github.com/0day-ci/linux

>          git fetch --no-tags linux-review Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443

>          git checkout 05c714d7b4e1722a75f949e40c5305f3ba28d048

>          # save the attached .config to linux build tree

>          make W=1 ARCH=i386

>

> If you fix the issue, kindly add following tag as appropriate

> Reported-by: kernel test robot <lkp@intel.com>

>

> All errors (new ones prefixed by >>):

>

>     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function 'atomisp_css_stop':

>>> drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2156:50: error: 'struct atomisp_sub_device' has no member named 'asd'

>      2156 |   list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);

>           |                                                  ^~

>     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2157:49: error: 'struct atomisp_sub_device' has no member named 'asd'

>      2157 |   list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);

>           |                                                 ^~

>     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2107:31: warning: unused variable 'md_buf' [-Wunused-variable]

>      2107 |  struct atomisp_metadata_buf *md_buf;

>           |                               ^~~~~~

>     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2106:26: warning: unused variable 'dis_buf' [-Wunused-variable]

>      2106 |  struct atomisp_dis_buf *dis_buf;

>           |                          ^~~~~~~

>     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2105:26: warning: unused variable 's3a_buf' [-Wunused-variable]

>      2105 |  struct atomisp_s3a_buf *s3a_buf;

>           |                          ^~~~~~~

>

>

> vim +2156 drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

>

>    2100	

>    2101	void atomisp_css_stop(struct atomisp_sub_device *asd,

>    2102			      enum ia_css_pipe_id pipe_id, bool in_reset)

>    2103	{

>    2104		struct atomisp_device *isp = asd->isp;

>    2105		struct atomisp_s3a_buf *s3a_buf;

>    2106		struct atomisp_dis_buf *dis_buf;

>    2107		struct atomisp_metadata_buf *md_buf;

>    2108		unsigned long irqflags;

>    2109		unsigned int i;

>    2110	

>    2111		/* if is called in atomisp_reset(), force destroy stream */

>    2112		if (__destroy_streams(asd, true))

>    2113			dev_err(isp->dev, "destroy stream failed.\n");

>    2114	

>    2115		/* if is called in atomisp_reset(), force destroy all pipes */

>    2116		if (__destroy_pipes(asd, true))

>    2117			dev_err(isp->dev, "destroy pipes failed.\n");

>    2118	

>    2119		atomisp_init_raw_buffer_bitmap(asd);

>    2120	

>    2121		/*

>    2122		 * SP can not be stop if other streams are in use

>    2123		 */

>    2124		if (atomisp_streaming_count(isp) == 0)

>    2125			ia_css_stop_sp();

>    2126	

>    2127		if (!in_reset) {

>    2128			struct atomisp_stream_env *stream_env;

>    2129			int i, j;

>    2130	

>    2131			for (i = 0; i < ATOMISP_INPUT_STREAM_NUM; i++) {

>    2132				stream_env = &asd->stream_env[i];

>    2133				for (j = 0; j < IA_CSS_PIPE_ID_NUM; j++) {

>    2134					ia_css_pipe_config_defaults(

>    2135					    &stream_env->pipe_configs[j]);

>    2136					ia_css_pipe_extra_config_defaults(

>    2137					    &stream_env->pipe_extra_configs[j]);

>    2138				}

>    2139				ia_css_stream_config_defaults(

>    2140				    &stream_env->stream_config);

>    2141			}

>    2142			memset(&asd->params.config, 0, sizeof(asd->params.config));

>    2143			asd->params.css_update_params_needed = false;

>    2144		}

>    2145	

>    2146		/* move stats buffers to free queue list */

>    2147		list_splice_init(&asd->s3a_stats_in_css, &asd->s3a_stats);

>    2148		list_splice_init(&asd->s3a_stats_ready, &asd->s3a_stats);

>    2149	

>    2150		spin_lock_irqsave(&asd->dis_stats_lock, irqflags);

>    2151		list_splice_init(&asd->dis_stats_in_css, &asd->dis_stats);

>    2152		asd->params.dis_proj_data_valid = false;

>    2153		spin_unlock_irqrestore(&asd->dis_stats_lock, irqflags);

>    2154	

>    2155		for (i = 0; i < ATOMISP_METADATA_TYPE_NUM; i++) {

>> 2156			list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);

>    2157			list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);

>    2158		}

>    2159	

>    2160		atomisp_flush_params_queue(&asd->video_out_capture);

>    2161		atomisp_flush_params_queue(&asd->video_out_vf);

>    2162		atomisp_flush_params_queue(&asd->video_out_preview);

>    2163		atomisp_flush_params_queue(&asd->video_out_video_capture);

>    2164		atomisp_free_css_parameters(&asd->params.css_param);

>    2165		memset(&asd->params.css_param, 0, sizeof(asd->params.css_param));

>    2166	}

>    2167	

>

> ---

> 0-DAY CI Kernel Test Service, Intel Corporation

> https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Andy Shevchenko June 17, 2021, 12:41 p.m. UTC | #4
On Thu, Jun 17, 2021 at 08:14:28PM +0800, libaokun (A) wrote:
> Sorry, I only tested it with 'x86_64.config'.

> 

> I'm about to send a patch v4 with the changes to fix the error under your

> config.


Please, do not top-post!


Problem here that you tested without additional warnings enabled.

Next time try to start with `make W=1 ...`

If you have installed Sparse tool, the better option would be
`make W=1 C=1 CF=-D__CHECK_ENDIAN__ ...`

> 在 2021/6/17 16:52, kernel test robot 写道:

> > Hi Baokun,

> > 

> > Thank you for the patch! Yet something to improve:

> > 

> > [auto build test ERROR on next-20210616]

> > 

> > url:    https://github.com/0day-ci/linux/commits/Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443

> > base:    c7d4c1fd91ab4a6d2620497921a9c6bf54650ab8

> > config: i386-allyesconfig (attached as .config)

> > compiler: gcc-9 (Debian 9.3.0-22) 9.3.0

> > reproduce (this is a W=1 build):

> >          # https://github.com/0day-ci/linux/commit/05c714d7b4e1722a75f949e40c5305f3ba28d048

> >          git remote add linux-review https://github.com/0day-ci/linux

> >          git fetch --no-tags linux-review Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443

> >          git checkout 05c714d7b4e1722a75f949e40c5305f3ba28d048

> >          # save the attached .config to linux build tree

> >          make W=1 ARCH=i386

> > 

> > If you fix the issue, kindly add following tag as appropriate

> > Reported-by: kernel test robot <lkp@intel.com>

> > 

> > All errors (new ones prefixed by >>):

> > 

> >     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function 'atomisp_css_stop':

> > > > drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2156:50: error: 'struct atomisp_sub_device' has no member named 'asd'

> >      2156 |   list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);

> >           |                                                  ^~

> >     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2157:49: error: 'struct atomisp_sub_device' has no member named 'asd'

> >      2157 |   list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);

> >           |                                                 ^~

> >     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2107:31: warning: unused variable 'md_buf' [-Wunused-variable]

> >      2107 |  struct atomisp_metadata_buf *md_buf;

> >           |                               ^~~~~~

> >     drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2106:26: warning: unused variable 'dis_buf' [-Wunused-variable]

> >      2106 |  struct atomisp_dis_buf *dis_buf;

> >           |                          ^~~~~~~


-- 
With Best Regards,
Andy Shevchenko
libaokun (A) June 17, 2021, 12:53 p.m. UTC | #5
Thank you for your advice.

I'll follow your advice strictly.

Best Regards.


在 2021/6/17 20:41, Andy Shevchenko 写道:
> On Thu, Jun 17, 2021 at 08:14:28PM +0800, libaokun (A) wrote:

>> Sorry, I only tested it with 'x86_64.config'.

>>

>> I'm about to send a patch v4 with the changes to fix the error under your

>> config.

> Please, do not top-post!

>

>

> Problem here that you tested without additional warnings enabled.

>

> Next time try to start with `make W=1 ...`

>

> If you have installed Sparse tool, the better option would be

> `make W=1 C=1 CF=-D__CHECK_ENDIAN__ ...`

>

>> 在 2021/6/17 16:52, kernel test robot 写道:

>>> Hi Baokun,

>>>

>>> Thank you for the patch! Yet something to improve:

>>>

>>> [auto build test ERROR on next-20210616]

>>>

>>> url:    https://github.com/0day-ci/linux/commits/Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443

>>> base:    c7d4c1fd91ab4a6d2620497921a9c6bf54650ab8

>>> config: i386-allyesconfig (attached as .config)

>>> compiler: gcc-9 (Debian 9.3.0-22) 9.3.0

>>> reproduce (this is a W=1 build):

>>>           # https://github.com/0day-ci/linux/commit/05c714d7b4e1722a75f949e40c5305f3ba28d048

>>>           git remote add linux-review https://github.com/0day-ci/linux

>>>           git fetch --no-tags linux-review Baokun-Li/media-staging-atomisp-use-list_splice_init-in-atomisp_compat_css20-c/20210617-043443

>>>           git checkout 05c714d7b4e1722a75f949e40c5305f3ba28d048

>>>           # save the attached .config to linux build tree

>>>           make W=1 ARCH=i386

>>>

>>> If you fix the issue, kindly add following tag as appropriate

>>> Reported-by: kernel test robot <lkp@intel.com>

>>>

>>> All errors (new ones prefixed by >>):

>>>

>>>      drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function 'atomisp_css_stop':

>>>>> drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2156:50: error: 'struct atomisp_sub_device' has no member named 'asd'

>>>       2156 |   list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);

>>>            |                                                  ^~

>>>      drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2157:49: error: 'struct atomisp_sub_device' has no member named 'asd'

>>>       2157 |   list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);

>>>            |                                                 ^~

>>>      drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2107:31: warning: unused variable 'md_buf' [-Wunused-variable]

>>>       2107 |  struct atomisp_metadata_buf *md_buf;

>>>            |                               ^~~~~~

>>>      drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:2106:26: warning: unused variable 'dis_buf' [-Wunused-variable]

>>>       2106 |  struct atomisp_dis_buf *dis_buf;

>>>            |                          ^~~~~~~
diff mbox series

Patch

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index f60198bb8a1a..3844180d32b5 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -2144,42 +2144,17 @@  void atomisp_css_stop(struct atomisp_sub_device *asd,
 	}
 
 	/* move stats buffers to free queue list */
-	while (!list_empty(&asd->s3a_stats_in_css)) {
-		s3a_buf = list_entry(asd->s3a_stats_in_css.next,
-				     struct atomisp_s3a_buf, list);
-		list_del(&s3a_buf->list);
-		list_add_tail(&s3a_buf->list, &asd->s3a_stats);
-	}
-	while (!list_empty(&asd->s3a_stats_ready)) {
-		s3a_buf = list_entry(asd->s3a_stats_ready.next,
-				     struct atomisp_s3a_buf, list);
-		list_del(&s3a_buf->list);
-		list_add_tail(&s3a_buf->list, &asd->s3a_stats);
-	}
+	list_splice_init(&asd->s3a_stats_in_css, &asd->s3a_stats);
+	list_splice_init(&asd->s3a_stats_ready, &asd->s3a_stats);
 
 	spin_lock_irqsave(&asd->dis_stats_lock, irqflags);
-	while (!list_empty(&asd->dis_stats_in_css)) {
-		dis_buf = list_entry(asd->dis_stats_in_css.next,
-				     struct atomisp_dis_buf, list);
-		list_del(&dis_buf->list);
-		list_add_tail(&dis_buf->list, &asd->dis_stats);
-	}
+	list_splice_init(&asd->dis_stats_in_css, &asd->dis_stats);
 	asd->params.dis_proj_data_valid = false;
 	spin_unlock_irqrestore(&asd->dis_stats_lock, irqflags);
 
 	for (i = 0; i < ATOMISP_METADATA_TYPE_NUM; i++) {
-		while (!list_empty(&asd->metadata_in_css[i])) {
-			md_buf = list_entry(asd->metadata_in_css[i].next,
-					    struct atomisp_metadata_buf, list);
-			list_del(&md_buf->list);
-			list_add_tail(&md_buf->list, &asd->metadata[i]);
-		}
-		while (!list_empty(&asd->metadata_ready[i])) {
-			md_buf = list_entry(asd->metadata_ready[i].next,
-					    struct atomisp_metadata_buf, list);
-			list_del(&md_buf->list);
-			list_add_tail(&md_buf->list, &asd->metadata[i]);
-		}
+		list_splice_init(&asd->metadata_in_css[i], &asd->asd->metadata[i]);
+		list_splice_init(&asd->metadata_ready[i], &asd->asd->metadata[i]);
 	}
 
 	atomisp_flush_params_queue(&asd->video_out_capture);