From patchwork Mon Oct 12 14:31:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 54771 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id A6CEE22DB6 for ; Mon, 12 Oct 2015 14:32:44 +0000 (UTC) Received: by wibzt1 with SMTP id zt1sf16255929wib.0 for ; Mon, 12 Oct 2015 07:32:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=CocTZxlIWohmuuGlwwBrYIoaMBoYgHnIear/PZuaDx8=; b=bl/lUS+FPPxlAH75A/BeDcLjyMzHvYDevGfgSDzcSi4TBwOmlPxkyppAZqFilOhDc1 D0+xy6F4BpUFtFu/lMjEwiTObjQo6yg19FlmrKhRrGBiAIdcEZ+4Tz5vJavCYOVvjOhe rC11/7Wia08rIvuuv3yf166BlnzuYTo71ZVWQMTmvuBtBjqaegEApoTjYDIfLqvvpiT1 ittfgkAoG0MAwUT/DJyODfaoQd2K674J8+r0jkL8fN3gr7iPkUCtvxHxqpoT2iV9hNRz J5/fs/syDCzJYOp37Mv+TI2UTHRrxia0hSaloe2ar2fvtYRQnRMmRMNbUY5QxIn6mypP 9YbQ== X-Gm-Message-State: ALoCoQnOpiGqvEk5NTAKHEiPAEIg9i1VHsyV0xZd2RhCgOAfGmjU6wagbHqANhkPCX7Zfj3LmFlP X-Received: by 10.112.12.132 with SMTP id y4mr5687174lbb.0.1444660363927; Mon, 12 Oct 2015 07:32:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.87.139 with SMTP id l133ls494181lfb.34.gmail; Mon, 12 Oct 2015 07:32:43 -0700 (PDT) X-Received: by 10.112.157.195 with SMTP id wo3mr12793256lbb.0.1444660363690; Mon, 12 Oct 2015 07:32:43 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id c70si11439879lfe.21.2015.10.12.07.32.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 07:32:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbcao8 with SMTP id ao8so145159793lbc.3 for ; Mon, 12 Oct 2015 07:32:43 -0700 (PDT) X-Received: by 10.112.163.131 with SMTP id yi3mr12556361lbb.36.1444660363526; Mon, 12 Oct 2015 07:32:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1583264lbq; Mon, 12 Oct 2015 07:32:42 -0700 (PDT) X-Received: by 10.66.190.6 with SMTP id gm6mr34556515pac.27.1444660362548; Mon, 12 Oct 2015 07:32:42 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hu10si26443080pad.131.2015.10.12.07.32.42; Mon, 12 Oct 2015 07:32:42 -0700 (PDT) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752854AbbJLOcj (ORCPT + 30 others); Mon, 12 Oct 2015 10:32:39 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:34016 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752140AbbJLOcd (ORCPT ); Mon, 12 Oct 2015 10:32:33 -0400 Received: by wicgb1 with SMTP id gb1so52844337wic.1 for ; Mon, 12 Oct 2015 07:32:32 -0700 (PDT) X-Received: by 10.180.76.170 with SMTP id l10mr16089571wiw.68.1444660350717; Mon, 12 Oct 2015 07:32:30 -0700 (PDT) Received: from localhost.localdomain (LPoitiers-656-1-62-228.w90-63.abo.wanadoo.fr. [90.63.143.228]) by smtp.gmail.com with ESMTPSA id az6sm11102907wib.12.2015.10.12.07.32.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Oct 2015 07:32:30 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang Cc: linux-i2c , LKML , Patrick Titiano , Bartosz Golaszewski Subject: [PATCH 8/9] eeprom: at24: remove a reduntant if Date: Mon, 12 Oct 2015 16:31:20 +0200 Message-Id: <1444660281-19150-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444660281-19150-1-git-send-email-bgolaszewski@baylibre.com> References: <1444660281-19150-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: bgolaszewski@baylibre.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index b5181a3..52875f4 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -613,10 +613,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;