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: 529126 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 02400140134 for ; Tue, 13 Oct 2015 01:32:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbbJLOce (ORCPT ); Mon, 12 Oct 2015 10:32:34 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:35530 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752091AbbJLOcb (ORCPT ); Mon, 12 Oct 2015 10:32:31 -0400 Received: by wicge5 with SMTP id ge5so152910796wic.0 for ; Mon, 12 Oct 2015 07:32:30 -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=ddCvxCLtaAB3qS2pYIG6r3gTaMqbzz2yD6IEBWMgOzjrRu6NhWbbSvvTS7DTcRz3pM cDtJf2AQgJGYKtxqOpTYMV8escOAgp9SQineankS8wO9oMaDA7tNQDzfJAPWCk78twi+ 1FTZ/BX3lpL2VfREQ+NHTO0Cba+AYeTTLEbC5zJ9zCB0OSwdnTle4+BlezPWA5fFvWdz UfEPdafGM/6oFWu+2OQ5QWRSX5BkU2WlQW1BE+Dxfl59m8XvTpDOrllYPZHs55Qmmn7t hnOOjHYByb3i0OxKIN1nG/QzGb94pcsssslGvLBxK4GcZyW/2X/bxuRLEH6mqHL13fCU /IHA== X-Gm-Message-State: ALoCoQm/0gxUxrOgHIjF0Q/e6LJ8YczUAMq3qALMac0xGgWOTYZookKH9K8xAhH7lkynIovWwYak 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-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;