From patchwork Tue Oct 27 11:43:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 55593 Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1739489lbq; Tue, 27 Oct 2015 04:44:39 -0700 (PDT) X-Received: by 10.50.20.233 with SMTP id q9mr5403871ige.33.1445946276367; Tue, 27 Oct 2015 04:44:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m70si28852435ioe.132.2015.10.27.04.44.36; Tue, 27 Oct 2015 04:44:36 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S932190AbbJ0Lo2 (ORCPT + 28 others); Tue, 27 Oct 2015 07:44:28 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:38722 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754209AbbJ0LoV (ORCPT ); Tue, 27 Oct 2015 07:44:21 -0400 Received: by wicll6 with SMTP id ll6so156099369wic.1 for ; Tue, 27 Oct 2015 04:44:20 -0700 (PDT) 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=EKcckZxdOknPAvaTGcOiZm5ayebbFTOwky02jS/COZY=; b=yjGkFlMXfkyjQO1E/vtznt6QEMhgGymE00+EZll+BaKwOPiBs9MakZ9iLtK0S6OiSl /+D5CBYTsPKaCVwN4ZBXpoi16SL0dc9VVg+9BaV+mvVtSODNNcMhpcr9yBZHPvQTKoys WeIjIXuuVCjiOtNFYr6zTUrx77JcC021DnNQI3qzX1OeVsf2F/itC4Urk7zmCT+JgCca rcJgvGiFtvrUktltv6HHPqMv9LH0Q4QH5jU9ljaXz6WQ/5pVEVfGECFWK8oAQZxzBF19 7vi6Fu+RqBYQDuOyLS2ga/HuVL5OPr42GVPQ7z2QjmOqMAwZDJ7UQ2XrMWX48YrNNj6f ca2A== 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=EKcckZxdOknPAvaTGcOiZm5ayebbFTOwky02jS/COZY=; b=HhYbQIpr756LmR0UmVof/Gregu23mpVCJgsIYpijwwNb8cbXDezK/UGiPQsSQDd5Ak tREqDgTVKfHxHhpWxZcCw2syef4+gFTQOnvOn2stash1rK0tajB0YBtD9OtF/e1NRMC7 8HYJLWeNiWfe4co+FLLjSwgJ5DK6zerIUH/+Ugy2xpcFCJ8uxYGJ40TKjn5V8x06Nr/4 CliOC6cCH0A301qTxPFxalW3FD5pC0XAuf+9IyUFDWjkTDYk/lAeuC5Hg+HlltsEr08j socqRozFNv0lJuWWRt1odJV54emCjGNYXHjT2GSHBFfdU+cejmQCAOYIkqZ0cehg9qZr hjWw== X-Gm-Message-State: ALoCoQkVxhlzYYuE/6zkr3uJbYbAzYV+VBxrDd65AZm/5YjcBpngJ3G0V8QMcP1T4B49u9kB1Vll X-Received: by 10.180.189.5 with SMTP id ge5mr25413313wic.85.1445946260502; Tue, 27 Oct 2015 04:44:20 -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 gd11sm17451281wic.20.2015.10.27.04.44.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Oct 2015 04:44:19 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang Cc: linux-i2c , LKML , Bartosz Golaszewski Subject: [PATCH v2 8/9] eeprom: at24: remove a reduntant if Date: Tue, 27 Oct 2015 12:43:52 +0100 Message-Id: <1445946233-6071-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445946233-6071-1-git-send-email-bgolaszewski@baylibre.com> References: <1445946233-6071-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 387d134..65f1479 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -619,10 +619,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;