From patchwork Mon Mar 27 15:13:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 9647015 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 32407602C8 for ; Mon, 27 Mar 2017 15:14:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2139528408 for ; Mon, 27 Mar 2017 15:14:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15F662841C; Mon, 27 Mar 2017 15:14:32 +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 C093228408 for ; Mon, 27 Mar 2017 15:14:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753143AbdC0POa (ORCPT ); Mon, 27 Mar 2017 11:14:30 -0400 Received: from mga03.intel.com ([134.134.136.65]:26640 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753453AbdC0PO3 (ORCPT ); Mon, 27 Mar 2017 11:14:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490627668; x=1522163668; h=subject:from:to:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=7tiX/XGy1D1y1U3c5PKpU0x077lxjh9v/jNMzIFOdXA=; b=bJSFR0e1jZAVTLihMl9z4w9NPbSyrMJVF2mjcr/Js1h3HRnNd84bpWse bHn6I6EFL7fnDpUjBlQVnIYKwLrrvg==; Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Mar 2017 08:13:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,232,1486454400"; d="scan'208";a="838924836" Received: from dclinto1-mobl2.ger.corp.intel.com (HELO rszulisx-mobl.ger.corp.intel.com) ([10.252.25.211]) by FMSMGA003.fm.intel.com with ESMTP; 27 Mar 2017 08:13:56 -0700 Subject: [PATCH 2/5] atomisp: Remove another dead define From: Alan Cox To: greg@kroah.com, linux-media@vger.kernel.org Date: Mon, 27 Mar 2017 16:13:56 +0100 Message-ID: <149062763137.15399.14721816276370656571.stgit@rszulisx-mobl.ger.corp.intel.com> In-Reply-To: <149062762280.15399.12714375439154128065.stgit@rszulisx-mobl.ger.corp.intel.com> References: <149062762280.15399.12714375439154128065.stgit@rszulisx-mobl.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 HAS_TNR3 is never defined so we can remove it. Signed-off-by: Alan Cox --- .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c index ada64bf..e6a3459 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c @@ -841,10 +841,6 @@ configure_isp_from_args( ia_css_ref_configure(binary, (const struct ia_css_frame **)args->delay_frames, pipeline->dvs_frame_delay); ia_css_tnr_configure(binary, (const struct ia_css_frame **)args->tnr_frames); ia_css_bayer_io_config(binary, args); -#ifdef HAS_TNR3 - /* Remove support for TNR2 once TNR3 fully integrated */ - ia_css_tnr3_configure(binary, (const struct ia_css_frame **)args->tnr_frames); -#endif return err; }