Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A7C1C433F5 for ; Tue, 16 Nov 2021 11:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21EE4613AD for ; Tue, 16 Nov 2021 11:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235171AbhKPLcn (ORCPT ); Tue, 16 Nov 2021 06:32:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:34766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235083AbhKPLcF (ORCPT ); Tue, 16 Nov 2021 06:32:05 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5314A61B39; Tue, 16 Nov 2021 11:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637062148; bh=l7NZiSDJabx9ABJweVm8PSddhwj8pVnGlFgRNwIG9r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AR4PxvAvohd8nE29x8vJ75xYXcvjYDk6kRIG5TUesXvWSwqniq4Ba8fyjDuD+72e1 6r8H+3u+cCCp4uS27GeVkMcZZ9v99pQeNz05bs1Ojn/Zn/sGU6yAN4ceRm7Am6KEYo zjqW2s8YhwIWGjz9DuaJhn1ffkxCc/uunpgCnMulLb+F7yUZHQJg+ilGf6dxgezRRS bwbw8kOrIdalBWFHX9+McB7soD12IYv2HyVRcgkmlRlpAew7Gpn6/KWGMhKq7zusXB 6SHmWleMAO5e8EHMLMQ/YzMYd9ORZfOxFLzNZTZXITIqZb4ywjRjP1RkPzpeSe1fy+ mBB2Ds/WZlblg== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1mmwe9-008QfU-Fj; Tue, 16 Nov 2021 11:29:05 +0000 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Greg Kroah-Hartman , Hans Verkuil , Martiros Shakhzadyan , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH 08/23] media: atomisp: drop an useless #ifdef ISP2401 Date: Tue, 16 Nov 2021 11:28:49 +0000 Message-Id: <2ee0cc013a060a634fefbd75f4ea1179dd57eb66.1637061474.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Yocto Aero driver for ISP2401 sets my_css_save.loaded_fw. As we're using the same firmware, remove the ifdef there. Signed-off-by: Mauro Carvalho Chehab --- To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/23] at: https://lore.kernel.org/all/cover.1637061474.git.mchehab+huawei@kernel.org/ drivers/staging/media/atomisp/pci/sh_css.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c index 3aa4f8bc39c4..51dbd4e495d0 100644 --- a/drivers/staging/media/atomisp/pci/sh_css.c +++ b/drivers/staging/media/atomisp/pci/sh_css.c @@ -1742,9 +1742,8 @@ ia_css_init(struct device *dev, const struct ia_css_env *env, return err; } fw_explicitly_loaded = false; -#ifndef ISP2401 + my_css_save.loaded_fw = (struct ia_css_fw *)fw; -#endif } if (!sh_css_setup_spctrl_config(&sh_css_sp_fw, SP_PROG_NAME, &spctrl_cfg)) return -EINVAL; -- 2.33.1