From patchwork Fri Dec 15 17:44:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 849280 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="vh1En3p2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyyVv6X0Hz9ryk for ; Sat, 16 Dec 2017 04:44:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755650AbdLORoy (ORCPT ); Fri, 15 Dec 2017 12:44:54 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:46358 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755867AbdLORo2 (ORCPT ); Fri, 15 Dec 2017 12:44:28 -0500 Received: by mail-wm0-f65.google.com with SMTP id r78so19036346wme.5; Fri, 15 Dec 2017 09:44:27 -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=k3UiCq5HGveqxP9g2EG3Jlj74VN6rl0fASmj1RcyYHo=; b=vh1En3p2ES02W+XqH/nGSXw7XE4etEYig+W7Y9SN74AP4j+wlTvii6/HJnaO+kWYG1 KMT9UMBJ1iGx8+sBMk57Mk9431L4rvCTHeNmfS8BI2qfvtPemIB77uz9MQk40m1Jfp/6 SRtfV7k6pXU6z1WB3h+uJRtmMhimFyZt5xPoT7foBxGxP3BroFSCu6h3pAJdsmzc1tAJ tcpM3fwCbVJxzed9jiG5KgZNBmPeA5CX3f+1H6ci2+/f0UFz6ptiaBKv5YCcQMYpXed2 WbtGRRwjiE1dwDo/kRr9/OSjQPkg50GzsCb4PqdslwrV0nJVStHQO+1kX9qXFPZhVCbN WZxg== 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=k3UiCq5HGveqxP9g2EG3Jlj74VN6rl0fASmj1RcyYHo=; b=qAq4tB/HtgsZP8creyu1gnH9qofRPY4P/KBWSphP+6A/1WVxa0t9MLWl/kAU1LAlgp 5M2Avh6aU+hXrZXc/mBrOlqNjkOUWw9tehc/aA+fqLGVWZYXC6kQvUYPxy+buJESWJVQ PtRCqhm3/kQf6hj4At8yQHdRzOfJrcKEdnvaxXdVEFyN11pjaMWr13d4ezIu8ibIlXLn C5ji6PD7nFuqxSu1AJuZcCL7t9Wnb5GN4ATXGF5MfFgc2spp8J9mp7OFc0b/o/hfNuKD 4Fzy9widPdRFZUkj/2xycCxUJzX7gN/8ADpQmm3ZQdGGt5U6E59eLKUHaQlfOa/XOBMs AdcQ== X-Gm-Message-State: AKGB3mIgTkF7OF+cYDkVuyxdyTnbMG9WPscW7UmpzVfIl6HERl2VRR+t vNgEzbnENh58kJ+EVfxMgZi5YQ== X-Google-Smtp-Source: ACJfBoth1Ne3XLVRM27xto8CMrQJIZg05XV5A08flGfsMz/7F+faui6ac6P04qjGfP0LiDiM+h+KXg== X-Received: by 10.80.171.22 with SMTP id s22mr18379817edc.67.1513359867039; Fri, 15 Dec 2017 09:44:27 -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 g25sm5781272edc.68.2017.12.15.09.44.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 09:44:26 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v4 2/3] i2c: core: add 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:04 +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 i2c_new_dummy is typically called from the probe function of the driver for the primary i2c client. It requires calls to i2c_unregister_device in the error path of the probe function and in the remove function. This can be simplified by introducing a device-managed version. Note the changed error case return value type: i2c_new_dummy returns NULL whilst devm_new_i2c_dummy returns an ERR_PTR. Signed-off-by: Heiner Kallweit Reviewed-by: Bartosz Golaszewski --- v2: - use new function _i2c_new_dummy with detailed error codes v3: - no changes v4: - reflect renaming to __i2c_new_dummy - add reviewed-by --- Documentation/driver-model/devres.txt | 3 +++ drivers/i2c/i2c-core-base.c | 38 +++++++++++++++++++++++++++++++++++ include/linux/i2c.h | 3 +++ 3 files changed, 44 insertions(+) diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index c180045eb..6e2bccf85 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -259,6 +259,9 @@ GPIO devm_gpio_request_one() devm_gpio_free() +I2C + devm_i2c_new_dummy + IIO devm_iio_device_alloc() devm_iio_device_free() diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 3b962456c..7a6669f07 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -864,6 +864,44 @@ struct i2c_client *i2c_new_dummy(struct i2c_adapter *adapter, u16 address) } EXPORT_SYMBOL_GPL(i2c_new_dummy); +static void devm_i2c_release_dummy(struct device *dev, void *res) +{ + i2c_unregister_device(*(struct i2c_client **)res); +} + +/** + * devm_i2c_new_dummy - return a new i2c device bound to a dummy driver + * @dev: device the managed resource is bound to + * @adapter: the adapter managing the device + * @address: seven bit address to be used + * Context: can sleep + * + * This is the device-managed version of i2c_new_dummy. + * Note the changed return value type: It returns the new i2c client + * or an ERR_PTR in case of an error. + */ +struct i2c_client *devm_i2c_new_dummy(struct device *dev, + struct i2c_adapter *adapter, + u16 address) +{ + struct i2c_client *ret, **dr; + + dr = devres_alloc(devm_i2c_release_dummy, sizeof(*dr), GFP_KERNEL); + if (!dr) + return ERR_PTR(-ENOMEM); + + ret = __i2c_new_dummy(adapter, address); + if (IS_ERR(ret)) { + devres_free(dr); + } else { + *dr = ret; + devres_add(dev, dr); + } + + return ret; +} +EXPORT_SYMBOL_GPL(devm_i2c_new_dummy); + /** * i2c_new_secondary_device - Helper to get the instantiated secondary address * and create the associated device diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 5d7f3c185..aca6ebbb8 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -441,6 +441,9 @@ extern int i2c_probe_func_quick_read(struct i2c_adapter *, unsigned short addr); extern struct i2c_client * i2c_new_dummy(struct i2c_adapter *adap, u16 address); +extern struct i2c_client * +devm_i2c_new_dummy(struct device *dev, struct i2c_adapter *adap, u16 address); + extern struct i2c_client * i2c_new_secondary_device(struct i2c_client *client, const char *name,