From patchwork Thu Mar 24 14:45:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 64390 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp699977lbc; Thu, 24 Mar 2016 07:52:37 -0700 (PDT) X-Received: by 10.98.32.23 with SMTP id g23mr13448384pfg.74.1458831153093; Thu, 24 Mar 2016 07:52:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ah10si2510270pad.118.2016.03.24.07.52.32; Thu, 24 Mar 2016 07:52:33 -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 S1757725AbcCXOw1 (ORCPT + 1 other); Thu, 24 Mar 2016 10:52:27 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:34381 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752330AbcCXOqT (ORCPT ); Thu, 24 Mar 2016 10:46:19 -0400 Received: by mail-wm0-f51.google.com with SMTP id p65so277599980wmp.1 for ; Thu, 24 Mar 2016 07:46:18 -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=P2/5pxXrJOgmAew6lsig2zxyGUJ+SCElj9oEL0poCrOsPLqg6oL3gPdEdXrs85AUEk +1dm2L6vLrfogDFqhscCvDRsiTVq45xp8BxvM4Pg72M4906E0+kf5yazKqXu1+CDsGP7 hU61Guxpiaqxiic2zoR0V9xQbF7Fc8ysHY9C++e8GKUwzTpp8qYHM6z7Q1FpsslGlpFt mgNSktnlfJNVAu5wY0mKUC26o3LZG5vPJ6q3s4U9MmQwmIu8mMis1h1TjeapOBx/iCc3 dylnJkIR5o6SklCNX8t7PiGyOuJ2hdtyeJ8/iz9Wop4TCC1EeA1MGJDlB3Eo7TxHE9Zo drOg== 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=HhSR5kxGQyPUoR+jRCTOpW3pRRvN2SiWvc5dVfUz2EXNvl02TbEyfxK38wXON6EZm6 rsDm1O5+hqPop6VydbNTtystinOpnNH0RPy+8h4cChFp+GRzslNcof7i0Q10D+aD6cBd dFqmSP3t8ahgPNPuctfrNUfatlZJ3zUfZpZoNObR7rWC+mj+hJp7gwUhhKH+72wh+WCN 8JZqugXxZbDcHrdbdyV+DYK3F3WN+YtGk6n1Y6LS3+zx0jIekqjFCQRIeiZ/PSDrs2nb oe1Fxz920xHng19oqTRd3eALHp93VMg/JWzTk5mkX/XNU195YScpbMTJtS0udeGNz54g p3+w== X-Gm-Message-State: AD7BkJLYWUkF99H/Oj+i3PLvK4rqvFlLlP1mSsKQ8tUWq11NnbWmhRWAjdrMKwWL4LtZCD7b X-Received: by 10.28.87.65 with SMTP id l62mr34972442wmb.102.1458830772284; Thu, 24 Mar 2016 07:46:12 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id k125sm27255752wmb.14.2016.03.24.07.46.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 07:46:11 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML Cc: Andrew Lunn , Bartosz Golaszewski Subject: [PATCH 01/13] eeprom: at24: remove a reduntant if Date: Thu, 24 Mar 2016 15:45:55 +0100 Message-Id: <1458830767-23816-2-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458830767-23816-1-git-send-email-bgolaszewski@baylibre.com> References: <1458830767-23816-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;