From patchwork Mon Dec 4 19:51:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 844393 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="sPqk23Hl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yrFqj4cgCz9sNV for ; Tue, 5 Dec 2017 06:51:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810AbdLDTvM (ORCPT ); Mon, 4 Dec 2017 14:51:12 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:41284 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751205AbdLDTvL (ORCPT ); Mon, 4 Dec 2017 14:51:11 -0500 Received: by mail-wr0-f195.google.com with SMTP id z18so18661431wrb.8 for ; Mon, 04 Dec 2017 11:51:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=Kuy4/52T5KiyTnui+QPfQSdb+kfS+OVsMlhG+Pobbww=; b=sPqk23HlYjvEh1QUsJIkyxKCabumCV4b+P6NKSysVu68ww+/dfCdbHIk/bwztLV0N5 y9Dj95fVA87xsqcnAPMt/rghyhIs5RcQS0s3FuEeZLPBIiAXIib1VFEqESXIU8bpnQOw 69mn8XS/B2u0lvxMbS3pzg/kYzpdOu7bB87A1GgcXLLa1UsKcYDq948emDidBBLCZmn5 pA01NGyGREp1mZgrl6QY7twkpVnpfIk85HdwwQPtkwsK5vR5/yAU12BkgbDFNxmaJ6C4 t5bwpQ6YP/r3EBSrt3DESdQJ6w7tRBoiJRuS50eD31k2Ch04lyVh6B4WtM0HPoLdoH2t zFxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=Kuy4/52T5KiyTnui+QPfQSdb+kfS+OVsMlhG+Pobbww=; b=XPSh0ixQ+0IDy1FVpjhUFtQVKil5uG3/6yWqa7WiSiZNQKzsoVxinaa9J5EK5JssMU SdJcczvaojz7hOy4kevm18znj+K9VJtA/gnbEsAKnmqelDN6SlH1MDfGy0gp6B8NLeFi 379M5t8XOxGFzfU+0UVhOX+h6+TFp03rfqx+Iv6LphzTdSXTioaCQ1KC/s/Rp5aMfuZf T79SHivrzXAzafM62o+jRw3sKzEAW/5i3pm6gCUsmg0qr9YsGSUei2pEiXifLAzEgQoR 6O3NVq7coBTki0WOqy9ivx/TcrJr3L10YXHU/LEaLCQmIlcX+Yi5K5ZRPkjBy8InfZbM VLgg== X-Gm-Message-State: AJaThX6LVwPo8cP0o92YQBHk7AcOFXSi8JrQpzumdkcqtvkjnfPNDLMb hgCq0lJLtRqwG1tSfSRhHgWyeg== X-Google-Smtp-Source: AGs4zMbROIGPsz1j24nNco6gTkRo6KfeZjfzBYCYbFDg4m/UpYoTcghXdwETnW/VrXC8i0r2QxmZ5w== X-Received: by 10.223.162.137 with SMTP id s9mr15128322wra.272.1512417069550; Mon, 04 Dec 2017 11:51:09 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:a1ff:ecd1:ad89:2e1d? (p200300EA8BC0E400A1FFECD1AD892E1D.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:a1ff:ecd1:ad89:2e1d]) by smtp.googlemail.com with ESMTPSA id s30sm16766653wrc.89.2017.12.04.11.51.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 11:51:09 -0800 (PST) Subject: [PATCH] eeprom: at24: switch to device-managed version of i2c_new_dummy From: Heiner Kallweit To: Bartosz Golaszewski , Peter Rosin , Wolfram Sang Cc: "linux-i2c@vger.kernel.org" References: Message-ID: <9221930c-a64d-0c7c-2a72-75b25b76de4a@gmail.com> Date: Mon, 4 Dec 2017 20:51:05 +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 --- drivers/misc/eeprom/at24.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 625b00166..9e9fe69b4 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -621,9 +621,10 @@ 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) { + at24->client[i].client = devm_i2c_new_dummy(&client->dev, + client->adapter, + client->addr + i); + if (IS_ERR(at24->client[i].client)) { dev_err(&client->dev, "address 0x%02x unavailable\n", client->addr + i); err = -EADDRINUSE; @@ -686,10 +687,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 +695,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);