From patchwork Mon Mar 20 09:32:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9633997 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2070F60327 for ; Mon, 20 Mar 2017 12:44:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1734323B23 for ; Mon, 20 Mar 2017 12:44:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BF5127FA3; Mon, 20 Mar 2017 12:44:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AC1C2780C for ; Mon, 20 Mar 2017 12:44:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753599AbdCTJdT (ORCPT ); Mon, 20 Mar 2017 05:33:19 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:65347 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753442AbdCTJcz (ORCPT ); Mon, 20 Mar 2017 05:32:55 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MBCTt-1cxI3l3glp-00ACzO; Mon, 20 Mar 2017 10:32:44 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Greg Kroah-Hartman , Alan Cox , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 4/9] staging/atomisp: remove sh_css_lace_stat code Date: Mon, 20 Mar 2017 10:32:20 +0100 Message-Id: <20170320093225.1180723-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170320093225.1180723-1-arnd@arndb.de> References: <20170320093225.1180723-1-arnd@arndb.de> X-Provags-ID: V03:K0:VC6az2bRLH0Doi9I9ztr77FN1GNz+2MSUZiXZI6HPXATteS5lt4 RCk9o9maoK1CNE5IhucVbEI8/jaYlNKxfEtZIc71G7ZkGy0vaClCD8pM/naM4jz8jgnWJoV DTcHSThGELUW3/AtrNjYttSk2LNJcp23ZfndpIL7AljFo6v3zRoWUQ3T/hwCCTBY47yzLuW rwqugf3YpPX6uSN52Ntyg== X-UI-Out-Filterresults: notjunk:1; V01:K0:xwt6EhRZfzI=:m2YDvOGe0Jpld/TDjwBZ8S YJkTEKZoiH/tALeVmjiASTp+O0gzOk8ZxSbvhCTV571+FT074u8B1e9nUGmJpOpy4Ub6I1sdd CQw4XLbNLN7M97rEMmFdJeOMyq5Z8KlXhuKe0ZMZOp1hi4RhkuV/70LN0LeQc3VDJbL+MSbmj NlkngAXaWjA7rE/oFlqo0nrgJHcOoh7fOQRvTozeEA6lO9Unq74omwulH7772yH5uVjR2Cz/c sfkjqqToLlNRx0vWe+u1hLGhm6zy4SWf3+lG9egI3nP73bavh3l56g6IfQe9ZPo0og06ssYOb cl8Birt4Ffb/Z6t53KFY2G+gdRbcKKTL6xaq9uUt4n+aU/60dwfNMcIAt1jzBgni7eIzKEBuB mvDQ1JzyLtXxYBsia+NLhttQPR/wVuBVLFkuF3ED8MNZa9fBcxp6smfhuiTOgaUlPFodKuCS/ 0O0aRuZm+IIS9TGqB5b/1nkOBD+N6aWbfw1+ET55WuBB3dSb4+L2nHj6F1zrZPkPHiJJ8RH3y lUwhiJJt7osuEIot80LfOHCOHOEfERzUYajTjiQ2gklsrXFLv2gly7CeCjGTEJ2j/BKXqw5RO WNVyZTwQU5VZ/S66CB3rXqhFM5JkLUsierDFT4a28VnvchSA3K3igIWoZMVFb84jj3hd4IOLn efWZluMav24KP+sXP/9zG6Unzm+quKNi/2favHyyFq0J1ckLoGKBft77hYjPXaMUC1SM= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2") Signed-off-by: Arnd Bergmann --- .../staging/media/atomisp/pci/atomisp2/Makefile | 1 - .../media/atomisp/pci/atomisp2/css2400/ia_css.h | 1 - .../atomisp/pci/atomisp2/css2400/ia_css_buffer.h | 1 - .../pci/atomisp2/css2400/ia_css_lace_stat.h | 37 ---------------------- .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 1 - .../pci/atomisp2/css2400/sh_css_lace_stat.c | 16 ---------- .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 15 --------- 7 files changed, 72 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_lace_stat.h delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_lace_stat.c diff --git a/drivers/staging/media/atomisp/pci/atomisp2/Makefile b/drivers/staging/media/atomisp/pci/atomisp2/Makefile index f538e56ed1a7..463f84cca4d8 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/Makefile +++ b/drivers/staging/media/atomisp/pci/atomisp2/Makefile @@ -108,7 +108,6 @@ atomisp-objs += \ 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/s3a/s3a_1.0/ia_css_s3a.host.o \ - css2400/sh_css_lace_stat.o \ css2400/sh_css_pipe.o \ css2400/ia_css_device_access.o \ css2400/sh_css_host_data.o \ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h index f67626f5258c..2458b3767c90 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h @@ -42,7 +42,6 @@ #include "ia_css_stream_format.h" #include "ia_css_stream_public.h" #include "ia_css_tpg.h" -#include "ia_css_lace_stat.h" #include "ia_css_version.h" #include "ia_css_mmu.h" #include "ia_css_morph.h" diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h index 26b16f469042..b2ecf3618c15 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h @@ -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_dvs_statistics *stats_dvs; /**< 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_acc_param *custom_data; /**< Custom buffer. */ struct ia_css_metadata *metadata; /**< Sensor metadata. */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_lace_stat.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_lace_stat.h deleted file mode 100644 index 6fee1e200a8a..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_lace_stat.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h index a70a72a34507..9a3fe2b5d9ca 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h @@ -44,7 +44,6 @@ #include "ia_css_frame_comm.h" #include "ia_css_3a.h" #include "ia_css_dvs.h" -#include "ia_css_lace_stat.h" #include "ia_css_metadata.h" #include "runtime/bufq/interface/ia_css_bufq.h" #include "ia_css_timer.h" diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_lace_stat.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_lace_stat.c deleted file mode 100644 index 850aa5e5f811..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_lace_stat.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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 */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c index 1f346394c6b1..eab9e7ecae06 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c @@ -1225,10 +1225,6 @@ struct ia_css_isp_skc_dvs_statistics { ia_css_ptr p_data; }; -struct ia_css_isp_lace_statistics { - ia_css_ptr p_data; -}; - static enum ia_css_err ref_sh_css_ddr_address_map( struct sh_css_ddr_address_map *map, @@ -2841,17 +2837,6 @@ struct ia_css_isp_skc_dvs_statistics *ia_css_skc_dvs_statistics_allocate(void) 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 * ia_css_metadata_allocate(const struct ia_css_metadata_info *metadata_info) {