Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4293678pxk; Tue, 22 Sep 2020 15:57:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyne7cVNDOfGfCeBucBKNkFrTh+Xb9kYtKezI/3sZaAouTvSEZqxzUVw6JBBaCYmOTEVIUb X-Received: by 2002:a50:e44b:: with SMTP id e11mr6548512edm.73.1600815476055; Tue, 22 Sep 2020 15:57:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600815476; cv=none; d=google.com; s=arc-20160816; b=DKjA12U2/eABHCxiJhpUzf6kQqW2fWxGf2sK6Dcl9l6ToRqxUYGaRgSxryQfFliX82 d4rzVpI3muSrTn3hoRnFZbilMnJJAbNmWBbACa7J4IAJxWC4dOSzUvhKygPmtj/ctzEi e/mRWXqov9dTUy93Z7dhvFMG62p6ZIhB9/5DFprwY4lwBwI0zPrL1Bl06VBQB+HgqTcD TLP3tb8bLwDvGEyvXqruYuJyOuy8heclWpzY875y6SvrL28wqrP5o25J7DJRncq8q7Ul UwaxvsQaldogqSgJvXCNz07y0/KI8OygIoL4f9rft+uPY3GzrMShomd8T9VKqdqmo5no IFOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DtwhdcYe1/rW3u1cX4z6pvysE+j6MqsTW1PsvueCYsE=; b=jf471IoOdlcC7qfwsQftgrlWvOgQdhoJQGwTOhWFqA7UNnrFdRoaEF8lP3Rb46KlUJ 4dtRUH5OCL6f8+sJbyJH4LJ8yrA+fvVtk29bGRT1nLkJb4QhoTXqB1JpBQY2adYn0H09 pXsgGv+n1eHRsX/59qPSis1zKODX/7KHk8g0nYNK6itsiekUJ6PEHQeTWmTK77086Xcj 34EqbEuv3YUEBZxYgAYNI/9gK/NKAiZySG53Xg/Cg5ujXYPK4LAoaKTvKJWmZHSQk5++ /z0ijhJhlGXBKcL6I7CiX/BUBS6cR6mzdymIAM4iZzLajQVUbXrzucN95gE6U45hGBwV nxtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=CMI6UU5z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o17si13058476ejg.470.2020.09.22.15.57.32; Tue, 22 Sep 2020 15:57:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=CMI6UU5z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727182AbgIVWxt (ORCPT + 99 others); Tue, 22 Sep 2020 18:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727010AbgIVWwv (ORCPT ); Tue, 22 Sep 2020 18:52:51 -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 403E9C0613D1; Tue, 22 Sep 2020 15:52:49 -0700 (PDT) Received: by mail-lf1-x143.google.com with SMTP id b22so19824172lfs.13; Tue, 22 Sep 2020 15:52:49 -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=DtwhdcYe1/rW3u1cX4z6pvysE+j6MqsTW1PsvueCYsE=; b=CMI6UU5z2XqW9YiVQINQT1oa3GkoooQU8YBSScgQFubdI/+z3gKBf7LSESabI+C0+Z QpkJK5d/WeE3xk7O9ommgxrWSnQ49qA3ueg1wrj3lNy5wgH6YKMLaLkvsY1VBYdJME0Z e3o8T494mtA45mHcJI0p+pZcXWhIWUmygzf7WxWt265Pm+rZnT+lnHCSgDiiTpmXcCUc IXyPOHPJ52Tmq49OPJJF+L5YC7sQJK1EPM4EwYgwVpS0T/niMlZZSxPnN2D683+Om22k pDpDspA+3QN7N3nL956vObB6WFxeQLDIYr6gEIHGUkXzYp6ML6Zxacb4TIH8WGJPcmY/ hipw== 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=DtwhdcYe1/rW3u1cX4z6pvysE+j6MqsTW1PsvueCYsE=; b=Gbx1YpfV//gWPyv9cY/83jowqAT5SD+vbbe81FUbWvVSqIOv+jCT8TQ3DZyP5s3toX qWoOmJhLqkNA/7144Odko2K1dGXT63L6Z2RYVgFu3tmD9rL1GkjqAlxTTwoH53OTZ1B3 fLUqVFkcmAXd/EadicyK4JRAnpQs4Mk4DG0wniUXydWBcXAx3QMioZVbsbBlwQeUl7pO Bqzz5gDSPA/LOxo3ec8hGTsYTKNScfYOtPVqrVkPu3OyP3BHAyAjFQb89yL0IgemlGHo 9ViWA4SNB52XsidXkrPI7enVDjPhAw/x/+uDDXXoiqDcTXvC0SWiApVm5b0abfw1CHv1 mbFg== X-Gm-Message-State: AOAM531G4lD53h8xcmKzDX75NZlR9t0L5a8s1D9Vh4dRi7SlUYJGafYb eHf+Jaf+yvMfUUlD11sOOB4= X-Received: by 2002:ac2:5df3:: with SMTP id z19mr2172712lfq.567.1600815167689; Tue, 22 Sep 2020 15:52:47 -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 l15sm3977588lfk.71.2020.09.22.15.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 15:52:47 -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 v8 18/32] i2c: tegra: Remove likely/unlikely from the code Date: Wed, 23 Sep 2020 01:51:41 +0300 Message-Id: <20200922225155.10798-19-digetx@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200922225155.10798-1-digetx@gmail.com> References: <20200922225155.10798-1-digetx@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The likely/unlikely annotations should be used only in a hot paths of performance-critical code. The I2C driver doesn't have such paths, and thus, there is no justification for usage of likely/unlikely annotations in the code. Hence remove them. Reviewed-by: Michał Mirosław Acked-by: Thierry Reding Tested-by: Thierry Reding Signed-off-by: Dmitry Osipenko --- drivers/i2c/busses/i2c-tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 347651401cd6..dc25578adb6b 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -852,7 +852,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) goto err; } - if (unlikely(status & status_err)) { + if (status & status_err) { tegra_i2c_disable_packet_mode(i2c_dev); if (status & I2C_INT_NO_ACK) i2c_dev->msg_err |= I2C_ERR_NO_ACK; @@ -1294,7 +1294,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->msg_err); i2c_dev->is_curr_dma_xfer = false; - if (likely(i2c_dev->msg_err == I2C_ERR_NONE)) + if (i2c_dev->msg_err == I2C_ERR_NONE) return 0; tegra_i2c_init(i2c_dev); -- 2.27.0