From patchwork Tue Oct 20 08:43:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 532835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E1A411401DE for ; Tue, 20 Oct 2015 19:45:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752262AbbJTIo6 (ORCPT ); Tue, 20 Oct 2015 04:44:58 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:37076 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932175AbbJTIny (ORCPT ); Tue, 20 Oct 2015 04:43:54 -0400 Received: by wicfv8 with SMTP id fv8so17447882wic.0 for ; Tue, 20 Oct 2015 01:43:53 -0700 (PDT) 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=YBtPAyU8lKI4JdnmrxiZIUVxpVN4haHaSbdR/T5AVj8=; b=e3WGzOvKHe1bOxnqWFxC8zGPCDBYvVIMdlRMGanZpNzqrxgu/4wBUfmOeMLSIPTLZA HY98GaBCi1Tpxf2kPN0/jjpS7hcSb0quqdaICcJC3m+H4x9ZFFEAdZ0bfu1MN7tj4vj1 uMG8mIkNNWBcwon78WmQ9r29sFiKAmY1S9Se8wHJrbDUdqPzDkPuGcjgvaT/4nBhurx9 3HGzNX0WRpiNgtzgmxxlPWjbhmA4qa5b0Al3GcRWKZ5i3Ff/D5r9/VQRFoYWXV/mLzvh s34D0mmsuftINnj5phjLaUbyBhIFjlNmEJutmtNjF6ZNQb+IJ2ZA9YO+ZwklUeHtsBnV bplw== X-Gm-Message-State: ALoCoQkSsymfDfLv+aSaTQ4aeLdkWP9gTzgoRF7Ntg47H8/GD6arfW6mKULj/aDcShPgrtkq9P69 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 To: Wolfram Sang Cc: linux-i2c , LKML , Bartosz Golaszewski 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-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(-) 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;