From patchwork Mon Apr 11 18:57:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 65556 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1518590qge; Mon, 11 Apr 2016 11:57:51 -0700 (PDT) X-Received: by 10.98.9.219 with SMTP id 88mr35440173pfj.0.1460401071669; Mon, 11 Apr 2016 11:57:51 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u22si4919091pfa.245.2016.04.11.11.57.51; Mon, 11 Apr 2016 11:57:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-i2c-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-i2c-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-i2c-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754262AbcDKS5u (ORCPT + 1 other); Mon, 11 Apr 2016 14:57:50 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33103 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752792AbcDKS5t (ORCPT ); Mon, 11 Apr 2016 14:57:49 -0400 Received: by mail-pa0-f52.google.com with SMTP id zm5so126675570pac.0 for ; Mon, 11 Apr 2016 11:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZPOO13g5rTCMK7zvmh0RoXtTOzwaH1vbSVf28bOTiaQ=; b=RA+11+zei1V6yGyvuMO81Dxa/3OvClJipIhZ0PvjW8IBoBtXwpGfAAe2bracR5k6eV xNQhZFEB4Kg7BQP+SpTUnWzjQ0tGfLWRdiwp2do8S4C2zg4yJSt/yGL4bow9zdQCucfa ppYdfe7WvJfasvjf4/BfoJy9/rz8f/TIdPhn26iqHUf68yo844/n+iV3wtgm2Qpxf3Pl ZocQpXom+YLVufuTzWEq1e0q2hDbqz46iL7HuM69BIavHbR//xrlRKwnrcwAkhSmUOaI NS9w38JQsyYoT8B6vWRhtrCiMgi/f5lJdmiyfzOXdlTKZXQXhGgdhIFhtj5ekfNP5/qF hbtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZPOO13g5rTCMK7zvmh0RoXtTOzwaH1vbSVf28bOTiaQ=; b=IOLsSB8kvPlOo5MfMqDBiggCsU8Mnug20Dh+PFzCLfSmdz8E6vEUM5koENc9D8t60f zOVlHMsKY+R4HGROVG9BOQbM7GdDM5DgTKDigGUEdmjJnL4S7BqliITn2k03YDdNyggB 1r6lkTj4mtnoHTbkPIa67+EWTMCVLBf7cg1ALYJqz1FpvOk3Cr+l1d1OKUfKpmn36ZyW 4FnM3kCNO5V5gqt6rYOe7gf+CJogZgAFUT2aijXIufBscAfVXiaHeAwvCbEnv46vgT6l QzzIbKRS8eqDp/wvEdcJXegmxOQVmRrc8PEhlqD3NkVNl5qhk8raXs5uaoTKY8DY/YgL y6pQ== X-Gm-Message-State: AOPr4FVuq9Ao5A6BnDyyQte1qXOmjuj816+7NNOjKtdilAxRYQN/TQYvJu9vzdbcbZ8NzLum X-Received: by 10.66.124.198 with SMTP id mk6mr20794527pab.25.1460401069174; Mon, 11 Apr 2016 11:57:49 -0700 (PDT) Received: from localhost.localdomain (cpe-172-248-200-249.socal.res.rr.com. [172.248.200.249]) by smtp.gmail.com with ESMTPSA id ke7sm22322404pad.44.2016.04.11.11.57.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Apr 2016 11:57:48 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML , srinivas.kandagatla@linaro.org, maxime.ripard@free-electrons.com Cc: Andrew Lunn , Bartosz Golaszewski Subject: [RESEND PATCH v2 01/13] eeprom: at24: remove a reduntant if Date: Mon, 11 Apr 2016 11:57:17 -0700 Message-Id: <1460401049-25459-2-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1460401049-25459-1-git-send-email-bgolaszewski@baylibre.com> References: <1460401049-25459-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org It seems as if the second check for I2C_FUNC_I2C functionality had been introduced accidentally during a merge. Tt's reduntant, so remove it. Signed-off-by: Bartosz Golaszewski --- drivers/misc/eeprom/at24.c | 3 --- 1 file changed, 3 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 089d694..001a9af 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -544,10 +544,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) } else { return -EPFNOSUPPORT; } - } - /* Use I2C operations unless we're stuck with SMBus extensions. */ - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)) { use_smbus_write = I2C_SMBUS_I2C_BLOCK_DATA;