From patchwork Wed Jun 3 07:00:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11585143 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2E8290 for ; Wed, 3 Jun 2020 07:01:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B1B3C20823 for ; Wed, 3 Jun 2020 07:01:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591167697; bh=KH29YEuParkhVcZgvESxlf+E49kxxHP8MfihF720ksc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K95ZKMS6ZJ1uTi1lbzC9pr50qdhks02E83SVbVCETSZAQklK/zGjJyVzQ6mQ8YFP3 zwxsVsmhR4CZbAT/QnYBkcxE9IKpXLOT/IgAuXuJ+YGaccbFQ0NKs975qRTNe+oMWG VGMcPl2YGK+3UAcSPsxU0A+o7bsJqI8DEbATX0lI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726155AbgFCHBJ (ORCPT ); Wed, 3 Jun 2020 03:01:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:43400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725995AbgFCHBH (ORCPT ); Wed, 3 Jun 2020 03:01:07 -0400 Received: from mail.kernel.org (ip5f5ad5c5.dynamic.kabel-deutschland.de [95.90.213.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 87764207F7; Wed, 3 Jun 2020 07:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591167665; bh=KH29YEuParkhVcZgvESxlf+E49kxxHP8MfihF720ksc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B53c8WC0mGUV8/+NKV0FjhKwUDPnGIHSTz5k8h3nYUoRhpAdqXIlFiAZ7Os5s0D6q GciT4og6cmQKbvr50HqGnzYPhfGfBEd4462TalK86QAJLIiUF2yjQTUAkAT052O7jr BJ7ilqZP7od+b7m+dJYtFkPxTViR19+fv8kJXN8Y= Received: from mchehab by mail.kernel.org with local (Exim 4.93) (envelope-from ) id 1jgNOZ-004j8G-8F; Wed, 03 Jun 2020 09:01:03 +0200 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/15] media: atomisp: get rid of ifdef nonsense Date: Wed, 3 Jun 2020 09:00:50 +0200 Message-Id: <82d6e2b75e5dba3c44ee379f62f299a617a02f4e.1591167358.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There are some ifdefs there that end doing the same thing. Get rid of them. Signed-off-by: Mauro Carvalho Chehab --- .../atomisp/pci/isp2400_input_system_local.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h index 58ea58ba56e4..4b7034e4adb4 100644 --- a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h +++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h @@ -21,15 +21,14 @@ #include "input_system_global.h" #include "input_system_defs.h" /* HIVE_ISYS_GPREG_MULTICAST_A_IDX,... */ -#include "css_receiver_2400_defs.h" /* _HRT_CSS_RECEIVER_2400_TWO_PIXEL_EN_REG_IDX, _HRT_CSS_RECEIVER_2400_CSI2_FUNC_PROG_REG_IDX,... */ -#if defined(IS_ISP_2400_MAMOIADA_SYSTEM) + +/* + * _HRT_CSS_RECEIVER_2400_TWO_PIXEL_EN_REG_IDX, * _HRT_CSS_RECEIVER_2400_CSI2_FUNC_PROG_REG_IDX,... + */ +#include "css_receiver_2400_defs.h" + #include "isp_capture_defs.h" -#elif defined(IS_ISP_2401_MAMOIADA_SYSTEM) -/* Same name, but keep the distinction,it is a different device */ -#include "isp_capture_defs.h" -#else -#error "input_system_local.h: 2400_SYSTEM must be one of {2400, 2401 }" -#endif + #include "isp_acquisition_defs.h" #include "input_system_ctrl_defs.h"