From patchwork Wed Dec 2 10:25:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 57548 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2772528lbb; Wed, 2 Dec 2015 02:26:39 -0800 (PST) X-Received: by 10.98.18.22 with SMTP id a22mr3442951pfj.54.1449051999637; Wed, 02 Dec 2015 02:26:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mi6si3836838pab.95.2015.12.02.02.26.39; Wed, 02 Dec 2015 02:26:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757058AbbLBK0W (ORCPT + 28 others); Wed, 2 Dec 2015 05:26:22 -0500 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37511 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752541AbbLBKZn (ORCPT ); Wed, 2 Dec 2015 05:25:43 -0500 Received: by wmww144 with SMTP id w144so50312880wmw.0 for ; Wed, 02 Dec 2015 02:25:42 -0800 (PST) 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=5H3rvayV1GHuc+vPIxUBUKtOQfO4kTGkrffRzr3sXHo=; b=KP9yLcZj6V0xtXJky2JNXaGE4ZIWHdsLZTseLsS+eh1SQWRP0ub/nlKnKYheqvVuZW bvAqDXYtpXFoQCvzXUUB8Bia7U84mpoy5a+d/MLaKsq3HMm+Pz0O34BVUSbankzbjsUW ATqFpRdUnR1ErDfBVTTy2J80YWNkhqsuFq1EzLggs/MGQEfE4hco2+iv0qGncJ1yX9TU Ii7hwwY8EI7Y5CpPZQNSJBk9b1GnNi0RuuCCIPLzyNJ1IK89hOrWBWY94w6IPqXiQZ/B qSEN+eRz5qzNTWSbUVEbF8FGUPoRXrPP105akq71r004+cPdZS+Jg5N0+Yp60DaxtZiX sG9A== 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=5H3rvayV1GHuc+vPIxUBUKtOQfO4kTGkrffRzr3sXHo=; b=hz5kRNYtvypCq8BrrVOzAsivd7hv94yqIdLgw3PfhSR0Aq30bDF94294CsHPOr9I6d mgvf0GJ/h4RCdcx1lzx//r7WmZ0Cilp3xw4WiKRl1xElLqNHYn1sBqPuDhY0/GeDk8D8 SZ1msI9lB9vWp+pu5gLyMlr3Qi2SUyDtBpuYhg3Nf1FBQ5QUFAmZmC95gvJQkwIU+3ri KAfzzkNdK4LWNc509sYAuCzb7lTMiinkN1p9fmDpzj/sbwZfnh5l3WEbeHumaYKl18zo iC14LTFWP1jDxUsNV2YQy1AsGM66m8nnPn1Ecb8o1CqJfAxUmnVHEcrwVlr7SepRG8hh lIvQ== X-Gm-Message-State: ALoCoQkIyTGIhaCWyFxuZlRrUBDSzETlLpOnJMtdz2+zl/c0N92YluEIX+mwYhnneYzdV2yxeYh9 X-Received: by 10.28.26.147 with SMTP id a141mr45021383wma.36.1449051942267; Wed, 02 Dec 2015 02:25:42 -0800 (PST) Received: from bgdev-debian.home ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id bg10sm2077707wjb.46.2015.12.02.02.25.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Dec 2015 02:25:41 -0800 (PST) From: Bartosz Golaszewski To: Wolfram Sang Cc: linux-i2c , LKML , Bartosz Golaszewski Subject: [RESEND PATCH v2 8/9] eeprom: at24: remove a reduntant if Date: Wed, 2 Dec 2015 11:25:25 +0100 Message-Id: <1449051926-21918-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449051926-21918-1-git-send-email-bgolaszewski@baylibre.com> References: <1449051926-21918-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 6e28b02..1288193 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -634,10 +634,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;