From patchwork Fri Dec 15 23:07:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 849417 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="Um8nLuCW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yz5gl4F9Dz9s7v for ; Sat, 16 Dec 2017 10:08:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756711AbdLOXHr (ORCPT ); Fri, 15 Dec 2017 18:07:47 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35076 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756528AbdLOXHm (ORCPT ); Fri, 15 Dec 2017 18:07:42 -0500 Received: by mail-wr0-f193.google.com with SMTP id z104so367219wrb.2; Fri, 15 Dec 2017 15:07:41 -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=W9jtJLLTySOai3R5d9W2E9HtAJAIlVg4oH3GcWr8sqc=; b=Um8nLuCWpM0LkFacEcsHk7CHVDlbd+XQ1ORwIURCUqUxOtBne1VxyEpwGLYKFXuSyQ yuSR7/+/a277Z1wwIngZPgBboRBpD2TzBLbsbC9GfKYJcI7YhxIt2uge9v6s0NwWf9dr T+RSWNPYXf9twt/q/dZqfwXx+64gGd4MmcmVr6OEyapt9x9beYQg7VhuOs5ogln/FlZG qqGqtCAkjB5Cyi0nTHF6bpJ/uAMQGAG/PPZwxmPJvDsSt/0DpBgg+HkkTFwRm+NE0FOB LO6QJqiOx9YuM8vw7qFkqRlp2bkOWJMOffBf1WyYY3fZ7gudZCoJfvkrVMDBCsM1uMdn XIAg== 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=W9jtJLLTySOai3R5d9W2E9HtAJAIlVg4oH3GcWr8sqc=; b=crIRa8r8jjUXh+94DT2+rV91JJba0kmykbUNsfMCGuNrJOReSjwDKhHSeqtwEgWIDY 86EoO5cw+K0kw19xCvX5MVswcDweJwNhXPjKEy4qSrs8nAnoJFRCp1m+QhoBpLl8Oby7 wYLJFXTDXfdQX18mSJ2tLTj8pREVauTys+Blt553PD80f5Y2PXoU4BRzXcRwoXY+ra+W WCA/v/2xkkZ5t5qX5LTqKSS5wzrYCYyMmzIKarWundg6HNQsZRxI3xJGWslMjeLiHko8 bVoyYiDfm8E0T5DTUpsfUIg/I4EzPK62u+4+jC445EcPiP24bpUCl3AGPIXQtKdSm7b9 yIcA== X-Gm-Message-State: AKGB3mLEjTM2V5+yPpzYieIiHFQjtNoi7OYJhGHNmtE0vNybrG3ln4Ua 1ODjqkSpqVnuymtVrBU43k6d/g== X-Google-Smtp-Source: ACJfBouRVxdWYII4l1h7etGROchBs/PruQyb3JOiBt97rqvXVJaVMRGhxHvpE97vI18bCm0e9pcRaA== X-Received: by 10.223.202.1 with SMTP id o1mr11383833wrh.233.1513379260625; Fri, 15 Dec 2017 15:07:40 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:b0d3:a11f:88fd:f202? (p200300EA8BC0E400B0D3A11F88FDF202.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:b0d3:a11f:88fd:f202]) by smtp.googlemail.com with ESMTPSA id u79sm3662478wma.26.2017.12.15.15.07.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 15:07:40 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v5 3/3] eeprom: at24: switch to device-managed version of i2c_new_dummy To: Bartosz Golaszewski , Wolfram Sang , Peter Rosin Cc: "linux-i2c@vger.kernel.org" , Linux Kernel Mailing List References: Message-ID: <1a7cd44c-529a-6bbd-c07c-19d3f93a73c1@gmail.com> Date: Sat, 16 Dec 2017 00:07:18 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.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 Make use of recently introduced device-managed version of i2c_new_dummy to simplify the code. Signed-off-by: Heiner Kallweit --- v2: - small improvements regarding code readability v3: - no changes v4: - no changes v5: - no changes --- drivers/misc/eeprom/at24.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 848fda8be..fce00fbe4 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -636,20 +636,19 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) /* use dummy devices for multiple-address chips */ for (i = 1; i < num_addresses; i++) { - at24->client[i].client = i2c_new_dummy(client->adapter, - client->addr + i); - if (!at24->client[i].client) { + struct at24_client *cl; + + cl = &at24->client[i]; + cl->client = devm_i2c_new_dummy(&client->dev, client->adapter, + client->addr + i); + if (IS_ERR(cl->client)) { dev_err(&client->dev, "address 0x%02x unavailable\n", - client->addr + i); - err = -EADDRINUSE; - goto err_clients; - } - at24->client[i].regmap = devm_regmap_init_i2c( - at24->client[i].client, config); - if (IS_ERR(at24->client[i].regmap)) { - err = PTR_ERR(at24->client[i].regmap); - goto err_clients; + client->addr + i); + return PTR_ERR(cl->client); } + cl->regmap = devm_regmap_init_i2c(cl->client, config); + if (IS_ERR(cl->regmap)) + return PTR_ERR(cl->regmap); } i2c_set_clientdata(client, at24); @@ -701,10 +700,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) return 0; err_clients: - for (i = 1; i < num_addresses; i++) - if (at24->client[i].client) - i2c_unregister_device(at24->client[i].client); - pm_runtime_disable(&client->dev); return err; @@ -713,15 +708,11 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) static int at24_remove(struct i2c_client *client) { struct at24_data *at24; - int i; at24 = i2c_get_clientdata(client); nvmem_unregister(at24->nvmem); - for (i = 1; i < at24->num_addresses; i++) - i2c_unregister_device(at24->client[i].client); - pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev);