From patchwork Mon May 8 06:26:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 91737 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1pvuLy-00HLEV-TJ; Mon, 08 May 2023 06:28:11 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232518AbjEHG2J (ORCPT + 1 other); Mon, 8 May 2023 02:28:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232185AbjEHG2H (ORCPT ); Mon, 8 May 2023 02:28:07 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9632A19D56 for ; Sun, 7 May 2023 23:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683527230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u+GKPljtf0bbm0Sf5mRrqhpg9XbqJkeZDiXckq915Y0=; b=IiYbzZYq4mqp4jLeBKnk+OT4Lp/jnLOFcoa4MWzXFQTGwotd3YQWdWSLr38yysOk0TYg36 7sTAgZ/q/XWP6FBXEhhjRj5fyREX0Aa5QT9Gh8JAtDkNAcuvS3dZshvriKz0aWiJ1QaYl+ wzNEvfIqQrSOwwtohZO36rtxpOaObP8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-223-OoUHPfJmMnOgCQv8XPLGjg-1; Mon, 08 May 2023 02:27:09 -0400 X-MC-Unique: OoUHPfJmMnOgCQv8XPLGjg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2496B811E7C; Mon, 8 May 2023 06:27:09 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.67.24.158]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22776492C13; Mon, 8 May 2023 06:27:05 +0000 (UTC) From: Kate Hsuan To: Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , linux-media@vger.kernel.org, linux-staging@lists.linux.dev Cc: Kate Hsuan Subject: [PATCH v2 3/5] staging: media: atomisp: sh_css_sp: Remove #ifdef ISP2401 Date: Mon, 8 May 2023 14:26:30 +0800 Message-Id: <20230508062632.34537-3-hpa@redhat.com> In-Reply-To: <20230508062632.34537-1-hpa@redhat.com> References: <20230508062632.34537-1-hpa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no The actions of ISP2401 and 2400 will be determined at the runtime. Reviewed-by: Hans de Goede Signed-off-by: Kate Hsuan --- drivers/staging/media/atomisp/pci/sh_css_sp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/sh_css_sp.c b/drivers/staging/media/atomisp/pci/sh_css_sp.c index 0dd58a7fe2cc..297e1b981720 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_sp.c +++ b/drivers/staging/media/atomisp/pci/sh_css_sp.c @@ -952,12 +952,10 @@ sh_css_sp_init_stage(struct ia_css_binary *binary, return 0; } -#if defined(ISP2401) - (void)continuous; - sh_css_sp_stage.deinterleaved = 0; -#else - sh_css_sp_stage.deinterleaved = ((stage == 0) && continuous); -#endif + if (IS_ISP2401) + sh_css_sp_stage.deinterleaved = 0; + else + sh_css_sp_stage.deinterleaved = ((stage == 0) && continuous); initialize_stage_frames(&sh_css_sp_stage.frames); /*