From patchwork Thu Aug 17 05:59:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 802349 X-Patchwork-Delegate: bartekgola@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BJccUyfI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xXwXf6Gpfz9t3B for ; Thu, 17 Aug 2017 15:59:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751679AbdHQF7q (ORCPT ); Thu, 17 Aug 2017 01:59:46 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36164 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751665AbdHQF7p (ORCPT ); Thu, 17 Aug 2017 01:59:45 -0400 Received: by mail-wr0-f193.google.com with SMTP id y67so6487810wrb.3 for ; Wed, 16 Aug 2017 22:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=fw3I/f+MZgJFr43N48rcEL5TQhmT7hWBfpWsDWmxAtw=; b=BJccUyfIZqYAJXHSdqn9NxF710CSWwvjSdudo++y5leLJnF4/+jEFZ73kyvaXWx56C S6HSmNVFP/iD+hSd+keesEjp1xhEGbOn4SyhpiVaMnmCS+OqmTTCR44qhXi3SZ0m6/Uk NNhgLX2HyIMxgh1NoQ54TQRo8AeckKuLuAF7LbnOLYV9NwvyZNn/G+R5EDzuhtGHASZC 7NZ4ajpXE9rfFbLpko51k/sCUnkEx6gjVkyMsBZEMDQ3oWd/I7mbKMThi6JGYVD1Aimh /VdV6scw9qr12xFjmZfhKwY9DBAYAMnE3+u5w80Jnb82Xww1DVg0dE2mxQZbYE2NzCdV GR8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=fw3I/f+MZgJFr43N48rcEL5TQhmT7hWBfpWsDWmxAtw=; b=b8nYOF4UHEEaxDqo1kjC9qM5Y7wuhaexQSQpZQ1GxpWCxu/Gk95Nu7mFi4GhaAAT8Z /oCcK4XKRYnzPix3Cyvuk2VC9RyZFZcGlzUlwQtlwIEthvfJ17oTfKcWZPsKmBzgZaS4 hqqxR17Y2+Ff7zLOborXmCzCbfQK6ivpQ/EPzApLx4La7wkQz7vudfSkPzJagR2IdHpu ev8ONMknnhz/inimT4JHdhlVKA8am6cW0NFs3TUOc+NKK4LZKfQ/cwdLcYvt5U39bwuN 73W0gzeDl5ddvxxlTUv5Tq1MQoI2jK2u2wDry4gTy0APiDQ8fAJ/N13tc3i8GxCRoFQz ZlJA== X-Gm-Message-State: AHYfb5irAIpjUgW480tGKCKU4odQg6NXCcledNa9qkMhst6yCDUqNjLc N53CnKWHmhfwkUGU X-Received: by 10.28.96.212 with SMTP id u203mr503819wmb.48.1502949583961; Wed, 16 Aug 2017 22:59:43 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc7:5e00:b1d4:11c8:15b6:16bf? (p200300EA8BC75E00B1D411C815B616BF.dip0.t-ipconnect.de. [2003:ea:8bc7:5e00:b1d4:11c8:15b6:16bf]) by smtp.googlemail.com with ESMTPSA id j18sm2070508wrd.90.2017.08.16.22.59.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 22:59:43 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH RFC 7/7] eeprom: at24: remove now unneeded smbus-related code To: Wolfram Sang Cc: "linux-i2c@vger.kernel.org" References: <2e264f77-2316-b6b6-e66c-b162f77d81de@gmail.com> Message-ID: <26a09a4b-2f2d-2f9d-b252-d0f3cf85bffa@gmail.com> Date: Thu, 17 Aug 2017 07:59:26 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <2e264f77-2316-b6b6-e66c-b162f77d81de@gmail.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Remove remaining now unneeded code dealing with SMBUS details. Signed-off-by: Heiner Kallweit --- drivers/misc/eeprom/at24.c | 52 ++++------------------------------------------ 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 8f2106d3..db8524b5 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -414,8 +414,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) struct at24_platform_data chip; kernel_ulong_t magic = 0; bool writable; - int use_smbus = 0; - int use_smbus_write = 0; struct at24_data *at24; int err; unsigned i, num_addresses; @@ -458,33 +456,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) dev_warn(&client->dev, "page_size looks suspicious (no power of 2)!\n"); - /* Use I2C operations unless we're stuck with SMBus extensions. */ - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { - if (chip.flags & AT24_FLAG_ADDR16) - return -EPFNOSUPPORT; - + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) if (i2c_check_functionality(client->adapter, - I2C_FUNC_SMBUS_READ_I2C_BLOCK)) { - use_smbus = I2C_SMBUS_I2C_BLOCK_DATA; - } else if (i2c_check_functionality(client->adapter, - I2C_FUNC_SMBUS_READ_WORD_DATA)) { - use_smbus = I2C_SMBUS_WORD_DATA; - } else if (i2c_check_functionality(client->adapter, - I2C_FUNC_SMBUS_READ_BYTE_DATA)) { - use_smbus = I2C_SMBUS_BYTE_DATA; - } else { - return -EPFNOSUPPORT; - } - - if (i2c_check_functionality(client->adapter, - I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)) { - use_smbus_write = I2C_SMBUS_I2C_BLOCK_DATA; - } else if (i2c_check_functionality(client->adapter, - I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) { - use_smbus_write = I2C_SMBUS_BYTE_DATA; + I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) chip.page_size = 1; - } - } if (chip.flags & AT24_FLAG_TAKE8ADDR) num_addresses = 8; @@ -518,21 +493,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) } writable = !(chip.flags & AT24_FLAG_READONLY); - if (writable) { - if (!use_smbus || use_smbus_write) { - - unsigned write_max = chip.page_size; - - if (write_max > io_limit) - write_max = io_limit; - if (use_smbus && write_max > I2C_SMBUS_BLOCK_MAX) - write_max = I2C_SMBUS_BLOCK_MAX; - at24->write_max = write_max; - } else { - dev_warn(&client->dev, - "cannot write due to controller restrictions."); - } - } + if (writable) + at24->write_max = min_t(unsigned int, chip.page_size, io_limit); /* use dummy devices for multiple-address chips */ for (i = 1; i < num_addresses; i++) { @@ -588,12 +550,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) dev_info(&client->dev, "%u byte %s EEPROM, %s, %u bytes/write\n", chip.byte_len, client->name, writable ? "writable" : "read-only", at24->write_max); - if (use_smbus == I2C_SMBUS_WORD_DATA || - use_smbus == I2C_SMBUS_BYTE_DATA) { - dev_notice(&client->dev, "Falling back to %s reads, " - "performance will suffer\n", use_smbus == - I2C_SMBUS_WORD_DATA ? "word" : "byte"); - } /* export data to kernel code */ if (chip.setup)