From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9A90C2BC11 for ; Tue, 8 Sep 2020 22:43:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7726121741 for ; Tue, 8 Sep 2020 22:43:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XiARmRmb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726369AbgIHWnp (ORCPT ); Tue, 8 Sep 2020 18:43:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729960AbgIHWkw (ORCPT ); Tue, 8 Sep 2020 18:40:52 -0400 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B31EC061786; Tue, 8 Sep 2020 15:40:51 -0700 (PDT) Received: by mail-lf1-x143.google.com with SMTP id y11so539436lfl.5; Tue, 08 Sep 2020 15:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OsS78V1q+vZh1E8rpIjUMymq1NkW9yJlg2YzWQ5yU2Q=; b=XiARmRmbnNZ4NWlQiTVVG4fosLLQzEeW7+ChTDquOEbbSmVRhwAVSagypkEzif7/A3 42qz7xjJJiTn+QWu5j8bhNN5HL5glhWp3D4LjX8aQOARYTtFZMK/nhoON1POQt0h5OyP KBUqihHu30MNyM+niFjPkb0OCYZKIRdALZHQC1D9FDZYy2hYEMvSN1rM/JMsHvK2as70 JT5+ElQFRlQiGNmdjmEiwLhUsFDR3GIEMPftRvRddATwiRIWpDfJlDP5wxaRXqrESGhz 9DGtokYICSJuPif7PGIM676yyyRPo+eycwbuSKYlJrcUZeu26X0+wOjjtwhMnKuv1sBs J8BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OsS78V1q+vZh1E8rpIjUMymq1NkW9yJlg2YzWQ5yU2Q=; b=K0Id2milbExfTpu3FftffVBG98vVwruQNhqXxCISfxwlkCDdewdoRux/CDXtpeBsW7 tyvthErqOPlQdcdAgcbilqBlSsD5Iw3DBLk/Z/y5PGrtOJ/PbpCm04amSlO1rNWXZPeb 8ZDuTLdLh9BfsRz8uQ9RYHYv/CyViYIgMN2nIKNbQejpWLjDBPAPPbDpDvVjOldraRX6 xFDK4oSA9TsN6sT95/VPgm682a2f2a8aSK/VSOG9aPMJWIhAYrFoxkzW+e1vIBEUEnv/ FiyB7ZyctOmGavw/G0FY3TZuhkp7+wVLj9OR3iujmqafKPR8NwB99J01GEKe4/32NFGQ 5vzw== X-Gm-Message-State: AOAM530LxJ2fwaI44yuAovCjXz0Wa+yPKk+UP9mdkviysiO9FhD8Cxse uBuG4uCSirPdrQ7Nt3qoVEo= X-Google-Smtp-Source: ABdhPJxebxvAnU369b/8BgvoNKzHmcKr5pAlLHT0O6e6oAf8IW0HtBDIFP7IsaumPhnZD6XtMEPH1Q== X-Received: by 2002:a19:644f:: with SMTP id b15mr537917lfj.136.1599604850110; Tue, 08 Sep 2020 15:40:50 -0700 (PDT) Received: from localhost.localdomain (109-252-170-211.dynamic.spd-mgts.ru. [109.252.170.211]) by smtp.gmail.com with ESMTPSA id s15sm268311ljp.25.2020.09.08.15.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 15:40:49 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Laxman Dewangan , Wolfram Sang , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Andy Shevchenko Cc: linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 19/34] i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear() Date: Wed, 9 Sep 2020 01:39:51 +0300 Message-Id: <20200908224006.25636-20-digetx@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200908224006.25636-1-digetx@gmail.com> References: <20200908224006.25636-1-digetx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The tegra_i2c_wait_for_config_load() checks for 'has_config_load_reg' by itself, hence there is no need to duplicate the check. Signed-off-by: Dmitry Osipenko --- drivers/i2c/busses/i2c-tegra.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index fd0d51ec447f..18968302457f 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1082,11 +1082,10 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap) reg = FIELD_PREP(I2C_BC_SCLK_THRESHOLD, 9) | I2C_BC_STOP_COND | I2C_BC_TERMINATE; i2c_writel(i2c_dev, reg, I2C_BUS_CLEAR_CNFG); - if (i2c_dev->hw->has_config_load_reg) { - err = tegra_i2c_wait_for_config_load(i2c_dev); - if (err) - return err; - } + + err = tegra_i2c_wait_for_config_load(i2c_dev); + if (err) + return err; reg |= I2C_BC_ENABLE; i2c_writel(i2c_dev, reg, I2C_BUS_CLEAR_CNFG); -- 2.27.0