From patchwork Wed Nov 22 07:06:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 840328 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="vKCGwuEV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yhYQm4Rbbz9s8J for ; Wed, 22 Nov 2017 18:06:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751216AbdKVHGX (ORCPT ); Wed, 22 Nov 2017 02:06:23 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:41981 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751371AbdKVHGX (ORCPT ); Wed, 22 Nov 2017 02:06:23 -0500 Received: by mail-wm0-f65.google.com with SMTP id b189so8028171wmd.0 for ; Tue, 21 Nov 2017 23:06:22 -0800 (PST) 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=Tjcdu08IA58iVsXmLLTHSk3UuPe3GW/jaungM2TsTSQ=; b=vKCGwuEVluxmNs7CmICRxwjy+AXy1wEtjGgnk4iPPFzGs31l2aXRvxk8ETVons0VkH xumaGxzJj4WcvCuOxLFQQ6yn4C2y+sS2vRidn3gIS1kU2FTo8re9zz1I2v/UNFsZ6u0c yHHLVVY80RoyBHmKyA3evTtwJAnaZXOpyNIObx+9MGWlIw15zhkhYOoQ+skes6hdWlve OihHoaCtgyVWSkQ81oaWKFd77vYevJ0BIlG2kB0lPGwzjgJOZ+B1DnxM0pmTidqhwD/D 8INe8nV05sZ/Btbybwdj/jUgYnGMsef4RsnJEFlTBLge67wbCTqVffdlfE837wDJpwQh LVgA== 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=Tjcdu08IA58iVsXmLLTHSk3UuPe3GW/jaungM2TsTSQ=; b=Nbm0T4L01TJ9xw78xmMbkLUjPeCcN2m46JXUUCbhHaAbQeqtPtZplluW2DR3pWcxbW QijyI7uWxJXuOpAFzI86Lt0NqiJCr9Jvze/s4Hu7qQwjoUNLTtucElbtH+HpDwHP1Bjh qxJl6vF3C5uQpCsGsEnIUPs0i7xQlIV2/fmzb5xgXZF7flyfyS/TNmnMWzYS9F6ihG8V QDHA3KSsD9IWQHryWgryVmMF5HVuITJ7PAc2BTbUrwuKjMyUQ4VfvTVsPozaLXQBoeoK wYFdjIynDUW5G8Az4S01PnOtIsDPO5eENCHtlWcc0aD7l0U/FSOggP31MsFtNl12mTNq cx+A== X-Gm-Message-State: AJaThX7v7wiao8fdS/C+88IAODcb7dXA720ctYBu8N9qYhF+B/sEWekm nUSRDGrKMKDZMSWlBgKfpsYamJ25Ygc= X-Google-Smtp-Source: AGs4zMZKsJp08Eva5jECCe1qxNmKEd2Sx0DChxIxtKR0QQigvXaZ4nNSlX/+vtSA/a2YpZ7O0A4Gsw== X-Received: by 10.80.181.70 with SMTP id z6mr28721271edd.201.1511334381861; Tue, 21 Nov 2017 23:06:21 -0800 (PST) Received: from [192.168.178.85] (pD9F90FDA.dip0.t-ipconnect.de. [217.249.15.218]) by smtp.googlemail.com with ESMTPSA id e46sm12002455edb.93.2017.11.21.23.06.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Nov 2017 23:06:21 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v3 7/7] eeprom: at24: remove now unneeded smbus-related code To: Bartosz Golaszewski Cc: "linux-i2c@vger.kernel.org" References: Message-ID: Date: Wed, 22 Nov 2017 08:06:09 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: 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 --- v2: - rebased v3: - rebased --- 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 fa1dfd9c0..fc20e610c 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -512,8 +512,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; @@ -565,33 +563,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; @@ -625,21 +600,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++) { @@ -700,12 +662,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)