From patchwork Mon Mar 20 14:41:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 9634335 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 09F476020B for ; Mon, 20 Mar 2017 14:43:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF3011FF26 for ; Mon, 20 Mar 2017 14:43:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E29B227CF3; Mon, 20 Mar 2017 14:43:17 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 354B51FF26 for ; Mon, 20 Mar 2017 14:43:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754648AbdCTOnE (ORCPT ); Mon, 20 Mar 2017 10:43:04 -0400 Received: from mga11.intel.com ([192.55.52.93]:9429 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753630AbdCTOmE (ORCPT ); Mon, 20 Mar 2017 10:42:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490020923; x=1521556923; h=subject:from:to:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=K3kqUF1HRFZF2puGfsLHrlMuL2Ct1o3qJcbtc73uPDg=; b=cbQzgP1gRgdoRvv6vFRbPG0JuRxcYR/dtLqTE7yaug1tScOAyRO/qNK2 2K9YiELCi3hw21Ex3dsaTaCnFkLhHQ==; Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Mar 2017 07:41:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,194,1486454400"; d="scan'208";a="78429730" Received: from acox1-desk1.ger.corp.intel.com ([10.252.22.109]) by fmsmga005.fm.intel.com with ESMTP; 20 Mar 2017 07:41:39 -0700 Subject: [PATCH 17/24] staging/atomisp: remove sh_css_lace_stat code From: Alan Cox To: greg@kroah.com, linux-media@vger.kernel.org Date: Mon, 20 Mar 2017 14:41:38 +0000 Message-ID: <149002089704.17109.4693988717975276634.stgit@acox1-desk1.ger.corp.intel.com> In-Reply-To: <149002068431.17109.1216139691005241038.stgit@acox1-desk1.ger.corp.intel.com> References: <149002068431.17109.1216139691005241038.stgit@acox1-desk1.ger.corp.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 From: Arnd Bergmann 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 Signed-off-by: Alan Cox --- .../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 162bcbf..ab10fc0 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/Makefile +++ b/drivers/staging/media/atomisp/pci/atomisp2/Makefile @@ -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/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 f67626f..2458b37 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 26b16f4..b2ecf36 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 6fee1e2..0000000 --- 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 a70a72a..9a3fe2b 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 850aa5e..0000000 --- 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 36a0c6b..2807bb8 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, @@ -2839,17 +2835,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) {