From patchwork Wed Dec 6 21:13:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 845354 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="HQK6zmET"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ysWZH3Mjhz9rxl for ; Thu, 7 Dec 2017 08:13:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751748AbdLFVNo (ORCPT ); Wed, 6 Dec 2017 16:13:44 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33035 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752472AbdLFVNd (ORCPT ); Wed, 6 Dec 2017 16:13:33 -0500 Received: by mail-wr0-f195.google.com with SMTP id v22so5353337wrb.0; Wed, 06 Dec 2017 13:13:32 -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=+DojR3ghDDfmhxUlV4NZKFh20UmYUR8FTnyzFosizLc=; b=HQK6zmETGhHhbHTKvMHV/yhbeSzJyO80n6dYRHUstcjX2vHwlVRcjKMAgdSLGfXwXI r7n0LTxrugOdUWQaUK4m+1UU6ldu0JBD24J1e/yvle9xivY51aoR9lGoHIUWwX1VlVJw s0npS2zQymeO3Gc85dlRxB6pT/KJtJrPyqdnk3dBKRBPZfHXPvuCZyKKizyDzwCBprEp eXLIgA6fcesUEwzHnDP+Oyal3FoAOcuvbQ7XQZdXxTrcUZ4Hk87poln+xwEo5D/iw8Gl Vreq2BXH2zQF/RZQyQj1gikO+V5DDoJlArfPYck29R05KaL9vF7Eqz0rY4grXJZjELxx rRfg== 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=+DojR3ghDDfmhxUlV4NZKFh20UmYUR8FTnyzFosizLc=; b=U/n0yZ2WZ+pjqABVMYfGaMmjq+dTV7m3FwThkytFwOVtKun0W8xiNXL3DG2h4U/Yss QFpDn3NoUlDZvCxCe11MdwE2s8pT1Kw4GrhJ1Yye72eq0N5cxNFi6k4DS0hMZTcWB8Iq jLL5aA1yIEnTLks3d9wo3IIZl1irtpdNdl+PH+b+SbibSIxY2/M0HrAZ/pakD45KwRLJ J55CSXJaplnoYPlxM40wUCxjP8/tRAdxyPAe5NxlHX1XbugnViLOGNcsNGfQDucoJ66K QauzZrETfSZ+6FfOS0ufWi78t/jxvWU0O+dyTR1bTVYRVZnzcAetU4DiEAdEAan7hB1d P0Mw== X-Gm-Message-State: AJaThX77f3v251sPHpp9gR252BPMZNQl6Y8TX/BkVSs8EGOZvHIBlBD0 4f+D4d4AZVKPgQGZnKdiOkLvyw== X-Google-Smtp-Source: AGs4zMZmhtkFu0hCG5YjWLEMeT14rBELJ2EEzRS9hcbcYxmJK79ZNRpKcFh2iFlR0LwCaadEFJNpqQ== X-Received: by 10.223.171.202 with SMTP id s68mr20235748wrc.13.1512594812085; Wed, 06 Dec 2017 13:13:32 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:a420:5584:4764:b636? (p200300EA8BC0E400A42055844764B636.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:a420:5584:4764:b636]) by smtp.googlemail.com with ESMTPSA id o2sm3675003wmf.27.2017.12.06.13.13.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2017 13:13:31 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v2 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: <9c9d3b21-4ab7-8377-2f1c-a4cfc6def418@gmail.com> Date: Wed, 6 Dec 2017 22:13:27 +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 --- 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);