From patchwork Wed Apr 12 18:22:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 40776 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyMuU-00041u-1v; Wed, 12 Apr 2017 18:22:30 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1cyMuR-0002va-2S; Wed, 12 Apr 2017 20:22:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753200AbdDLSW0 (ORCPT + 1 other); Wed, 12 Apr 2017 14:22:26 -0400 Received: from mga14.intel.com ([192.55.52.115]:26917 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413AbdDLSW0 (ORCPT ); Wed, 12 Apr 2017 14:22:26 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Apr 2017 11:22:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,191,1488873600"; d="scan'208";a="73164062" Received: from acox1-desk1.ger.corp.intel.com ([10.252.16.134]) by orsmga002.jf.intel.com with ESMTP; 12 Apr 2017 11:22:16 -0700 Subject: [PATCH 11/14] atomisp: remove satm kernel From: Alan Cox To: greg@kroah.com, linux-media@vger.kernel.org Date: Wed, 12 Apr 2017 19:22:13 +0100 Message-ID: <149202132616.16615.10431476367740144807.stgit@acox1-desk1.ger.corp.intel.com> In-Reply-To: <149202119790.16615.4841216953457109397.stgit@acox1-desk1.ger.corp.intel.com> References: <149202119790.16615.4841216953457109397.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-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.4.12.181517 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODY_SIZE_6000_6999 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' This isn't used so it can go in the bitbucket. Signed-off-by: Alan Cox --- .../staging/media/atomisp/pci/atomisp2/Makefile | 1 - .../css2400/isp/kernels/satm/ia_css_satm.host.c | 27 --------------- .../css2400/isp/kernels/satm/ia_css_satm.host.h | 29 ----------------- .../css2400/isp/kernels/satm/ia_css_satm_param.h | 30 ----------------- .../css2400/isp/kernels/satm/ia_css_satm_types.h | 35 -------------------- 5 files changed, 122 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.c delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.h delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_param.h delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_types.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/Makefile b/drivers/staging/media/atomisp/pci/atomisp2/Makefile index ab10fc0..8780914 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/Makefile +++ b/drivers/staging/media/atomisp/pci/atomisp2/Makefile @@ -80,7 +80,6 @@ atomisp-objs += \ css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.o \ css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.o \ css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.o \ - css2400/isp/kernels/satm/ia_css_satm.host.o \ css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.o \ css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.o \ css2400/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.o \ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.c deleted file mode 100644 index d35194b..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.c +++ /dev/null @@ -1,27 +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. - */ - -#include "ia_css_satm.host.h" - - -void -ia_css_satm_init_config( - struct sh_css_isp_satm_params *to, - const struct ia_css_satm_config *from, - unsigned size) -{ - (void) size; - - to->params.test_satm = from->params.test_satm; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.h deleted file mode 100644 index 807b716..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.h +++ /dev/null @@ -1,29 +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_SATM_HOST_H -#define __IA_CSS_SATM_HOST_H - -#include "ia_css_satm_param.h" -#include "ia_css_satm_types.h" - -extern const struct ia_css_satm_config default_satm_config; - -void -ia_css_satm_init_config( - struct sh_css_isp_satm_params *to, - const struct ia_css_satm_config *from, - unsigned size); - -#endif /* __IA_CSS_SATM_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_param.h deleted file mode 100644 index 062f79aa4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_param.h +++ /dev/null @@ -1,30 +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_SATM_PARAMS_H -#define __IA_CSS_SATM_PARAMS_H - -#include "type_support.h" - -/* SATM parameters on ISP. */ -struct sh_css_satm_params { - int32_t test_satm; -}; - -/* SATM ISP parameters */ -struct sh_css_isp_satm_params { - struct sh_css_satm_params params; -}; - -#endif /* __IA_CSS_SATM_PARAMS_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_types.h deleted file mode 100644 index 94f10e3..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_types.h +++ /dev/null @@ -1,35 +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_SATM_TYPES_H -#define __IA_CSS_SATM_TYPES_H - -/** - * \brief SATM Parameters - * \detail Currently SATM paramters are used only for testing purposes - */ -struct ia_css_satm_params { - int test_satm; /**< Test parameter */ -}; - -/** - * \brief SATM public paramterers. - * \details Struct with all paramters for SATM that can be seet from - * the CSS API. Currenly, only test paramters are defined. - */ -struct ia_css_satm_config { - struct ia_css_satm_params params; /**< SATM paramaters */ -}; - -#endif /* __IA_CSS_SATM_TYPES_H */