From patchwork Tue Nov 17 09:52:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 56761 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1829186lbb; Tue, 17 Nov 2015 01:53:18 -0800 (PST) X-Received: by 10.68.183.1 with SMTP id ei1mr19012247pbc.107.1447753998575; Tue, 17 Nov 2015 01:53:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wp3si56522505pab.160.2015.11.17.01.53.18; Tue, 17 Nov 2015 01:53:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-i2c-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-i2c-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-i2c-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 S1753507AbbKQJwz (ORCPT + 1 other); Tue, 17 Nov 2015 04:52:55 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:33365 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753476AbbKQJwo (ORCPT ); Tue, 17 Nov 2015 04:52:44 -0500 Received: by wmec201 with SMTP id c201so218308435wme.0 for ; Tue, 17 Nov 2015 01:52:43 -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=V09LLiZRb7HBHjj9Sq5Al7K0jEiGBnN+zrUMBp0TYYDvaLxJJbttusXk3xBWHLB6H3 vrhHqKtGIm4A/yutvEUjSUFltqsF4Yuk46PCwNuHbtsHpZBoF7hTUh767I1CPf8OPFtx pK1GpCy6ELStYXqjGIxwRVB3akn3UXI6L7bj3L35aa+WbP67+cno9L9j9GwpL7nLO7Xb tFHR+gFdVl9yGxFD04uaLKIevo+wDRbZNT2eKu7z1wHj98wkqXJwpZ76inMq7aX+3TBX tM4XxXsMhrmlAJqHJILe8yIgqh4sxrMHKlRQxnzCBLRpopy1RkfZXAf29WdfFUe6oJiU YjMw== 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=bX3jWHBoCSsVecM9PHw00ViX69kbNwdXDm6be+Akp0gesk7rP7U8bIZOlI6ZgB4bJp YI2sn2vorXZ+KMPXSRwyn1hNh4h/c6RS1lUyK3LNcvoRRQPa4nwOelGFh+cIWBgT8Zn4 AI6XJXpozVtMNnHveuHNkO2e21dtAz5raGgkNFlZBd8ip5fRrhfezo/bZ33KQdfn0tij gUmZTuWRCCL87vk4/xEfNnBI1aV3YpdaWqX6aeOy0o/pqkI0BrXjVavYoAgKvkvz3oOE VUHXojyxIfFYnyKU85afs+PgxUdBcp6YCPvGP1M5iOM2m6mEHiZ64/W6QdYudN1vawG6 IS4A== X-Gm-Message-State: ALoCoQmYq1qpyVVCA1Z0ppUcu3o9NEAFkqmstdTSJ+qnU1f5OrjRoKuIEZxmO1UYZNoPywzE1P4u X-Received: by 10.28.228.138 with SMTP id b132mr1657807wmh.46.1447753962955; Tue, 17 Nov 2015 01:52:42 -0800 (PST) Received: from bgdev-debian.home ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id bk7sm38993546wjb.25.2015.11.17.01.52.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Nov 2015 01:52:42 -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, 17 Nov 2015 10:52:29 +0100 Message-Id: <1447753950-17213-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447753950-17213-1-git-send-email-bgolaszewski@baylibre.com> References: <1447753950-17213-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(-) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;