From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 17 Oct 2023 16:55:04 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qslTN-00Bse6-1C for lore@lore.pengutronix.de; Tue, 17 Oct 2023 16:55:04 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qslTL-0003Z8-O8 for lore@pengutronix.de; Tue, 17 Oct 2023 16:55:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=x3rR/69to+xMIx4gfJprj6GMr5HAF/zAgbzUENoRRck=; b=3Gssm381F8pTDkxmr9BiPcK15t L9zfVtShnwkoYeOYOnImxBaEtYuCb9HndoZ8HMp2xcKWkJH9kfD2pzA36UyXTirmH/wkj2Ju2a8bD nOejaVXebpRETvsE8GqTh7ZH3+ocvVsOJ+8+oP9D437rzQeAFLqENqQHOEmc9QaTYEYVxRG/gO+IZ +gEUIMCy5YoM6GWpOXaKu1+2YO0+EsdtdkGhf9GtqlZnsAsfvUEpZru5dVR8dDeedEO6FUJo20/CD ZlSNxE/g50oTyIIvnqMKQH0yT2prfvhZFcn8q9Jj6JmQY4IHvkRVz6S29phV4QqW2zVGLJ31eZ8wz s5FC3gMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qslRx-00Ceau-0S; Tue, 17 Oct 2023 14:53:37 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qslQ2-00CcM5-0C for barebox@lists.infradead.org; Tue, 17 Oct 2023 14:51:41 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qslPy-0001wJ-Ek for barebox@lists.infradead.org; Tue, 17 Oct 2023 16:51:34 +0200 From: Marco Felsch To: barebox@lists.infradead.org Date: Tue, 17 Oct 2023 16:51:06 +0200 Message-Id: <20231017145131.3069283-5-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017145131.3069283-1-m.felsch@pengutronix.de> References: <20231017145131.3069283-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_075138_157129_983F890A X-CRM114-Status: GOOD ( 10.71 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 04/29] i.MX: HAB: remove unused init() hook X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The init() hook was never used so we can remove it to cleanup the code a bit. Signed-off-by: Marco Felsch --- Changelog: v2: - unchanged - v1-link: https://lore.barebox.org/barebox/20231010143314.2031253-1-m.felsch@pengutronix.de/T/#t drivers/hab/hab.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c index 29379ff871c8..04f88175c857 100644 --- a/drivers/hab/hab.c +++ b/drivers/hab/hab.c @@ -197,7 +197,6 @@ static int imx8m_hab_device_locked_down_ocotp(void) } struct imx_hab_ops { - int (*init)(void); int (*write_srk_hash)(const u8 *srk, unsigned flags); int (*read_srk_hash)(u8 *srk); int (*permanent_write_enable)(int enable); @@ -231,29 +230,20 @@ static struct imx_hab_ops imx8m_hab_ops_ocotp = { static struct imx_hab_ops *imx_get_hab_ops(void) { - static struct imx_hab_ops *ops, *tmp; - int ret; + static struct imx_hab_ops *ops; if (ops) return ops; if (IS_ENABLED(CONFIG_HABV3) && (cpu_is_mx25() || cpu_is_mx35())) - tmp = &imx_hab_ops_iim; + ops = &imx_hab_ops_iim; else if (IS_ENABLED(CONFIG_HABV4) && cpu_is_mx6()) - tmp = &imx6_hab_ops_ocotp; + ops = &imx6_hab_ops_ocotp; else if (IS_ENABLED(CONFIG_HABV4) && cpu_is_mx8mq()) - tmp = &imx8m_hab_ops_ocotp; + ops = &imx8m_hab_ops_ocotp; else return NULL; - if (tmp->init) { - ret = tmp->init(); - if (ret) - return NULL; - } - - ops = tmp; - return ops; } -- 2.39.2