From patchwork Wed Dec 13 19:11:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 848186 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="m96HFLGc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yxmXV1jHMz9t3F for ; Thu, 14 Dec 2017 06:12:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753144AbdLMTLz (ORCPT ); Wed, 13 Dec 2017 14:11:55 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:41493 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753097AbdLMTLu (ORCPT ); Wed, 13 Dec 2017 14:11:50 -0500 Received: by mail-wm0-f66.google.com with SMTP id g75so7118884wme.0; Wed, 13 Dec 2017 11:11:50 -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=NeTWXsxbscy71zAerpqVK3h2Eky6kl3FoPADTfmpdIU=; b=m96HFLGc0gdDJV83A2qZkg4lY2478+x4Qau9aVAgfYTBpbqkGe/4LvNNnK8bBQh/q4 LQu1WuDJFF8rItyXxKYIvBB+Q8o2pNP/bwB6cH2CZUoYM62/l066mpPaFuny7DONBHhF ZhMPEn52c6QxMzxU+MTy6Fy3qWb2/UXjSZ943LL/aa2PHpTy9N/smDYsK/mebmzFNmuv xp9rP6/YnIz4SMIVZCx2IO9PF/tEmxaNvTadn4KPjwuHlX8lbI7vWPXOr79L8cQcD1Jp EKCw1dq8DDHwxt5n13jFaAwE9xLtA/9c6dWt4s7uBkTwn30CgXnHA4Dx8oznqORhkE2s QB4w== 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=NeTWXsxbscy71zAerpqVK3h2Eky6kl3FoPADTfmpdIU=; b=DCiA6WrvJi3ZzBCaOsCwZKldkPXw+2zrjYeo3W8sFFpz9tJ/dtvDGwEkIMyZKuLRdU xE5fBOzCY9N1E6lfgaNAObIwcPuqJEvEvs/7RAJ3Gll19CCigD+rwoqCnKUOcmm+H12V QTj+kY7Hc+qVJZfkGWm43GjIr1slnc3KOEoqphJ6SrxL+YSkpGSxLMbrMp8PU8I/a3Jg 2i2J4k84twOshqUJJRL5s3qTVvXTB1lj7J+5qmV6S0zxZwzSiRgj72/YZ9zRVV3YEaHy TGW+0mDIzHOeU2AmM+5P7CvSMYazdACBYfA7f19pb5cG2nL/QOgb4WPMsYXluZ+82hpI ZwEg== X-Gm-Message-State: AKGB3mJp2oFaEml2WOrDiUQf1s/MzTf8ffvfzz51ymjxKJihaAuHqYLE DHHqcCWOhxfmZySRvmoetNA0QA== X-Google-Smtp-Source: ACJfBotRRvNq57o1MWRY+LTqb2+MvlcVC1VhA/SfMWEDH0Zjh3pMqurmhF6TCHxX8IAt8sBnADvBrg== X-Received: by 10.80.180.187 with SMTP id w56mr9274816edd.3.1513192309175; Wed, 13 Dec 2017 11:11:49 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:d163:20bf:7500:cc98? (p200300EA8BC0E400D16320BF7500CC98.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:d163:20bf:7500:cc98]) by smtp.googlemail.com with ESMTPSA id r8sm1789559edm.22.2017.12.13.11.11.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 11:11:48 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v3 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: <69b03782-cb1a-2b31-c8aa-1827caa66dd5@gmail.com> Message-ID: Date: Wed, 13 Dec 2017 20:11:38 +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: <69b03782-cb1a-2b31-c8aa-1827caa66dd5@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 --- v2: - small improvements regarding code readability v3: - 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);