Message ID | 1445330607-12470-9-git-send-email-bgolaszewski@baylibre.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <patchwork-forward+bncBDNONOHMUUCRBWH5S6YQKGQE7KC2YRA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id B2B8523024 for <linaro@patches.linaro.org>; Tue, 20 Oct 2015 08:44:09 +0000 (UTC) Received: by wibhd5 with SMTP id hd5sf3629633wib.0 for <linaro@patches.linaro.org>; Tue, 20 Oct 2015 01:44:09 -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=FFoamEL13AIkHzCa2kDZ9xnOThWmYzX7OZ9AQ3G90UWcTWR0T/MSoMPE7IkQE79Zg5 xST3vAqTXQM2mvMAwf3okHqZa/oZPbXFniXq0wB9QmH3D3LYXVtI9PtcAqGSXmd2lRww aJ4c+onmOpiPaAAC/dEQzGH8u2mBQ4nzOOkrfZE/NVNec57oXIGz+cqVafhc2jMNrUAD +SR/1p66hX0uwUbHavCt3jk9Nx0vtBSOWeM1DNX348ysRTjDJ1rV6/XD2FWgecRf21q7 7sieNo+wGNiZNXMc/c+pnnX57jCBdgeX+Y7KH9t1T8KwiL1OoU3JXKG2ufRxrBrOxvlz G8Vw== X-Gm-Message-State: ALoCoQmVVW8qzIrU4WCEpAc2146Vd0+fqjaFn44gt0j/G0bK60DFhwvRE2lx0etIlSKj79F4ILhC X-Received: by 10.112.130.41 with SMTP id ob9mr367474lbb.17.1445330649033; Tue, 20 Oct 2015 01:44:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.77.80 with SMTP id a77ls44130lfb.70.gmail; Tue, 20 Oct 2015 01:44:08 -0700 (PDT) X-Received: by 10.25.25.207 with SMTP id 198mr675715lfz.91.1445330648873; Tue, 20 Oct 2015 01:44:08 -0700 (PDT) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id h21si1441073lfb.104.2015.10.20.01.44.08 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 01:44:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lffv3 with SMTP id v3so2014070lff.0 for <patchwork-forward@linaro.org>; Tue, 20 Oct 2015 01:44:08 -0700 (PDT) X-Received: by 10.25.20.24 with SMTP id k24mr675442lfi.117.1445330648775; Tue, 20 Oct 2015 01:44:08 -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 w3csp1941745lbq; Tue, 20 Oct 2015 01:44:07 -0700 (PDT) X-Received: by 10.68.134.73 with SMTP id pi9mr2624496pbb.55.1445330646959; Tue, 20 Oct 2015 01:44:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id re6si3586475pab.143.2015.10.20.01.44.06; Tue, 20 Oct 2015 01:44:06 -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 S932225AbbJTIn7 (ORCPT <rfc822;pingbo.wen@linaro.org> + 28 others); Tue, 20 Oct 2015 04:43:59 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33062 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932174AbbJTIny (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 20 Oct 2015 04:43:54 -0400 Received: by wijp11 with SMTP id p11so35988452wij.0 for <linux-kernel@vger.kernel.org>; Tue, 20 Oct 2015 01:43:53 -0700 (PDT) X-Received: by 10.194.52.6 with SMTP id p6mr2813252wjo.119.1445330633702; Tue, 20 Oct 2015 01:43:53 -0700 (PDT) Received: from localhost.localdomain (cag06-6-78-235-100-105.fbx.proxad.net. [78.235.100.105]) by smtp.gmail.com with ESMTPSA id kr10sm2390754wjc.25.2015.10.20.01.43.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 01:43:52 -0700 (PDT) From: Bartosz Golaszewski <bgolaszewski@baylibre.com> To: Wolfram Sang <wsa@the-dreams.de> Cc: linux-i2c <linux-i2c@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>, Bartosz Golaszewski <bgolaszewski@baylibre.com> Subject: [RESEND PATCH 8/9] eeprom: at24: remove a reduntant if Date: Tue, 20 Oct 2015 10:43:26 +0200 Message-Id: <1445330607-12470-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445330607-12470-1-git-send-email-bgolaszewski@baylibre.com> References: <1445330607-12470-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> 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.215.47 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
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;
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 <bgolaszewski@baylibre.com> --- drivers/misc/eeprom/at24.c | 3 --- 1 file changed, 3 deletions(-)