From patchwork Tue Nov 24 09:44:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 57211 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1972667lbb; Tue, 24 Nov 2015 01:45:13 -0800 (PST) X-Received: by 10.98.15.215 with SMTP id 84mr21259851pfp.49.1448358313150; Tue, 24 Nov 2015 01:45:13 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gg6si423339pbd.161.2015.11.24.01.45.12; Tue, 24 Nov 2015 01:45:13 -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 S1754188AbbKXJpK (ORCPT + 28 others); Tue, 24 Nov 2015 04:45:10 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:36991 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754139AbbKXJo4 (ORCPT ); Tue, 24 Nov 2015 04:44:56 -0500 Received: by wmww144 with SMTP id w144so18146567wmw.0 for ; Tue, 24 Nov 2015 01:44:55 -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=Cq1A/woHC0LTont5MWNMLPcu+CUbjkSZgjG6wTxMBdnZBi5VQCqz+pn8P5rc8x/KLw 4aYyfa0gTDDuFv4JWPC4SVr4re/5YFs1rGuB/slyTe+g6r4fdgsIDQFdhmbJyP7PSZoF D1KJ/uMs13jECXuv6FhQLTUqE22qnIRklbfWdKYLKhoQWXCdearCytWgBb0dSMq/MuyG upyHfufDAI1K+e9e14xLSCIRLzxEW7zL6pLLZG/mEx6+yyNFncYVg368NmNdyEy2FsVo BnOgBfVa9Ai5RkIBXkZKbAVrCd0GqPsimy/xF5OCjIgHQLh8aG238JfESeyf6w/T1aGC 9Aaw== 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=mvsQWZaEVMLE7J/DpGOfYYpEcpnNvvswvjXiuLDbAQSHUjo4aqBSvrH8v2B+AvikFI 7tbJ6aWuvorIAp8zgXkrJDnf/GmW3pZTtIPHWRyHn8RjqlYaJ/CJUUEdB4dXpAHIqRy5 +InySXW5nxZ3rO3Tn7tx55EbtP7ZrGDjgiY2VpGji3GB26YfFS9b6MhjuKV7WxicPVEz zo7CDBPxuDLeyLPgkUZWdTWsXjblnG9UfjmzhZGT/VrKauDe9ndC+bNsxXDeEnK+R/gw UgCx1IPYQLeaSjfgbbEbt4iFuWQ6mnQhGK1m/t3AzINwKQTwlNLpN4mL+ayTu7y8AdE0 CmBw== X-Gm-Message-State: ALoCoQn7AGcujaGx6Qzb7vvOrgBP+dr8hgNR+wJE/tRovWhrgRnleXu2IfRG8XJdD2eicmUnpGGR X-Received: by 10.194.133.233 with SMTP id pf9mr35297796wjb.71.1448358295389; Tue, 24 Nov 2015 01:44:55 -0800 (PST) Received: from bgdev-debian.home ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id cl5sm17353156wjc.29.2015.11.24.01.44.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Nov 2015 01:44:54 -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: Tue, 24 Nov 2015 10:44:44 +0100 Message-Id: <1448358285-25016-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448358285-25016-1-git-send-email-bgolaszewski@baylibre.com> References: <1448358285-25016-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;