Commit 902ea5fc authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

staging/atomisp: remove sh_css_lace_stat code

I ran into a build warning on my randconfig build box:

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c: In function 'ia_css_lace_statistics_free':
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c:2845:64: error: parameter 'me' set but not used [-Werror=unused-but-set-parameter]

It turns out that not only the parameter is unused but the entire function has no
caller. Let's just remove it.

Fixes: a49d2536 ("staging/atomisp: Add support for the Intel IPU v2")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2293322
...@@ -106,7 +106,6 @@ atomisp-objs += \ ...@@ -106,7 +106,6 @@ atomisp-objs += \
css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.o \ css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.o \
css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.o \ css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.o \
css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.o \ css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.o \
css2400/sh_css_lace_stat.o \
css2400/sh_css_pipe.o \ css2400/sh_css_pipe.o \
css2400/ia_css_device_access.o \ css2400/ia_css_device_access.o \
css2400/sh_css_host_data.o \ css2400/sh_css_host_data.o \
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include "ia_css_stream_format.h" #include "ia_css_stream_format.h"
#include "ia_css_stream_public.h" #include "ia_css_stream_public.h"
#include "ia_css_tpg.h" #include "ia_css_tpg.h"
#include "ia_css_lace_stat.h"
#include "ia_css_version.h" #include "ia_css_version.h"
#include "ia_css_mmu.h" #include "ia_css_mmu.h"
#include "ia_css_morph.h" #include "ia_css_morph.h"
......
...@@ -60,7 +60,6 @@ struct ia_css_buffer { ...@@ -60,7 +60,6 @@ struct ia_css_buffer {
struct ia_css_isp_3a_statistics *stats_3a; /**< 3A statistics & optionally RGBY statistics. */ struct ia_css_isp_3a_statistics *stats_3a; /**< 3A statistics & optionally RGBY statistics. */
struct ia_css_isp_dvs_statistics *stats_dvs; /**< DVS statistics. */ struct ia_css_isp_dvs_statistics *stats_dvs; /**< DVS statistics. */
struct ia_css_isp_skc_dvs_statistics *stats_skc_dvs; /**< SKC DVS statistics. */ struct ia_css_isp_skc_dvs_statistics *stats_skc_dvs; /**< SKC DVS statistics. */
struct ia_css_isp_lace_statistics *stats_lace; /**< LACE statistics. */
struct ia_css_frame *frame; /**< Frame buffer. */ struct ia_css_frame *frame; /**< Frame buffer. */
struct ia_css_acc_param *custom_data; /**< Custom buffer. */ struct ia_css_acc_param *custom_data; /**< Custom buffer. */
struct ia_css_metadata *metadata; /**< Sensor metadata. */ struct ia_css_metadata *metadata; /**< Sensor metadata. */
......
/*
* Support for Intel Camera Imaging ISP subsystem.
* Copyright (c) 2015, Intel Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/
#ifndef __IA_CSS_LACE_STAT_H
#define __IA_CSS_LACE_STAT_H
/** @file
* This file contains types used for LACE statistics
*/
struct ia_css_isp_lace_statistics;
/** @brief Allocate mem for the LACE statistics on the ISP
* @return Pointer to the allocated LACE statistics
* buffer on the ISP
*/
struct ia_css_isp_lace_statistics *ia_css_lace_statistics_allocate(void);
/** @brief Free the ACC LACE statistics memory on the isp
* @param[in] me Pointer to the LACE statistics buffer on the
* ISP.
* @return None
*/
void ia_css_lace_statistics_free(struct ia_css_isp_lace_statistics *me);
#endif /* __IA_CSS_LACE_STAT_H */
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include "ia_css_frame_comm.h" #include "ia_css_frame_comm.h"
#include "ia_css_3a.h" #include "ia_css_3a.h"
#include "ia_css_dvs.h" #include "ia_css_dvs.h"
#include "ia_css_lace_stat.h"
#include "ia_css_metadata.h" #include "ia_css_metadata.h"
#include "runtime/bufq/interface/ia_css_bufq.h" #include "runtime/bufq/interface/ia_css_bufq.h"
#include "ia_css_timer.h" #include "ia_css_timer.h"
......
/*
* Support for Intel Camera Imaging ISP subsystem.
* Copyright (c) 2015, Intel Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/
/* This file will contain the code to implement the functions declared in ia_css_lace_stat.h
and associated helper functions */
...@@ -1225,10 +1225,6 @@ struct ia_css_isp_skc_dvs_statistics { ...@@ -1225,10 +1225,6 @@ struct ia_css_isp_skc_dvs_statistics {
ia_css_ptr p_data; ia_css_ptr p_data;
}; };
struct ia_css_isp_lace_statistics {
ia_css_ptr p_data;
};
static enum ia_css_err static enum ia_css_err
ref_sh_css_ddr_address_map( ref_sh_css_ddr_address_map(
struct sh_css_ddr_address_map *map, struct sh_css_ddr_address_map *map,
...@@ -2839,17 +2835,6 @@ struct ia_css_isp_skc_dvs_statistics *ia_css_skc_dvs_statistics_allocate(void) ...@@ -2839,17 +2835,6 @@ struct ia_css_isp_skc_dvs_statistics *ia_css_skc_dvs_statistics_allocate(void)
return NULL; return NULL;
} }
void
ia_css_lace_statistics_free(struct ia_css_isp_lace_statistics *me)
{
me = NULL;
}
struct ia_css_isp_lace_statistics *ia_css_lace_statistics_allocate(void)
{
return NULL;
}
struct ia_css_metadata * struct ia_css_metadata *
ia_css_metadata_allocate(const struct ia_css_metadata_info *metadata_info) ia_css_metadata_allocate(const struct ia_css_metadata_info *metadata_info)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment