From patchwork Fri Dec 15 17:44:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 849279 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="XAF29lBE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyyVn369wz9t2d for ; Sat, 16 Dec 2017 04:44:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932080AbdLORoe (ORCPT ); Fri, 15 Dec 2017 12:44:34 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:40135 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932088AbdLORoa (ORCPT ); Fri, 15 Dec 2017 12:44:30 -0500 Received: by mail-wm0-f68.google.com with SMTP id f206so19013684wmf.5; Fri, 15 Dec 2017 09:44:29 -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=dOJwHi8cykj5jB+HmwtbzPNA1kydhnshxRd/CS/5Ic8=; b=XAF29lBEq+Gztj7gzon6Ta2rOf6mjntdD8Ar4evA6RN0x0Q5j4i2aqL/Toy2uHW70T WlVsv7+NKiCQqIkem7+zCCQf/0FpZtBrmHGB+R+VZxY+6fs/ZbkokPmxgXmriX4c63Uu EN8hi8pFXGNGWS9+7spZv282buh6n6plFQqYmX7e2HSi7jIB3Z/JbQ69D2YUjIz00Vqk JcPR+7uDqbrDlmE0Dv0zYQhwQUz8wfTXPJNcnh++jSMybAzchR7BP7Xsw0cWzagIt/sw yLBnlpAN9N892hUtEGxpU4kjG/QyrQ2qdVHWiKaTP5KRa4aCozQvSoTp8Y1Zg1s+3Z8m wksw== 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=dOJwHi8cykj5jB+HmwtbzPNA1kydhnshxRd/CS/5Ic8=; b=pTGhlV4hOP6ROElplMDO8V5iltDqpWS8hQ4om2kl+PUTwCKUCOFuP3USroKKlEFl0K f+mbWEWfYoaivrdqrQexZX9uk8IWfFXNCEMQve5nrFXHKGGk14Y35mlmXvQfE9eqgiyK b3DZ/ldJgn+TLmt4RLOgpuctjyjtRYtc86KlpLvV72CFigNQ0rNN7cH9eC41CDeGrdou Axft+eq0qqp2iL4WGg29xdwervIZl6BkQ/HCqvOTVfsWXxfxdm3Ci1RdgH0XKAPmuIvn BXv8C4ABlNMyFcDFcUaLP1NVW1LBfK0JILqt4Fw55rbA7AbjctSVRWgHbszj7Y19W7yQ lZtw== X-Gm-Message-State: AKGB3mKcDdtX6+iE2kss5r7OkPoppaN/wIOJ5pzDNMRQMcunMmu57ylC 99N/XEenmT6pKRBYJDqb/eh9dQ== X-Google-Smtp-Source: ACJfBotGGRehvXJ3IUQRLitCLvzAgieYdMfQPurkOOi16U9gu4n+ESUczZaKo88OA9WjNJrV6yUsEQ== X-Received: by 10.80.217.6 with SMTP id t6mr18421315edj.217.1513359868518; Fri, 15 Dec 2017 09:44:28 -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 j39sm6160783ede.38.2017.12.15.09.44.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 09:44:28 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v4 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: <083569b1-489a-d84f-1a87-bca52fad53e1@gmail.com> Message-ID: Date: Fri, 15 Dec 2017 18:44:19 +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: <083569b1-489a-d84f-1a87-bca52fad53e1@gmail.com> 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 Reviewed-by: Bartosz Golaszewski --- v2: - small improvements regarding code readability v3: - no changes v4: - 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 625b00166..5f3a27a69 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -621,20 +621,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); @@ -686,10 +685,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; @@ -698,15 +693,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);