From patchwork Tue Dec 5 19:44:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 844888 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="kNg/HdRq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yrsfM4WgMz9t2c for ; Wed, 6 Dec 2017 06:45:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751821AbdLETpO (ORCPT ); Tue, 5 Dec 2017 14:45:14 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35683 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750812AbdLETpN (ORCPT ); Tue, 5 Dec 2017 14:45:13 -0500 Received: by mail-wm0-f68.google.com with SMTP id f9so3391621wmh.0; Tue, 05 Dec 2017 11:45:12 -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=ZRBfFot8pkVxdsjCedrvj8VTaywcL1X/TQDjiGqWNKc=; b=kNg/HdRqkVFfklbxUa1llqynwtcpm4UxbvO8e0/Ey93Nx1PsMCfWde3/k4LhKO6Mne kOeNJLqgWNBXWYSplhYvpt7jLPbHmArBB1lGMeNkL3qO/mMKGcqqhAF23y4ctHey7w7c R8tgk1RWC9pOlzSdMHCrbapAt8VpSEpHfsb38ndKrqWWxn32grRe5GznUq8SSVrfX2aC Z8uPWJo6QqREpe2iOW7Bb+U1JA40HQ5t5ptkAbkTXLm6rn5C/xGeZijm0AtSvOTyy4zc yoMJLioLRRGWyvs4wInnpa+U1ezotWGQ6b/4O4JJHCH9CFvtUvqN1AHujGwjyOghLUTm QOQQ== 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=ZRBfFot8pkVxdsjCedrvj8VTaywcL1X/TQDjiGqWNKc=; b=BqyX0VZtSyy+BzYG60jHns1nX9DasjmilUQ+23UPjjMNYVFtyxXCsYxaqSNQmpVAD+ 4C5o0X/9KRHl+xnrjjE3Kpf5CWjQ13uC8q6mnclVZWtvaITYO4zqgOjLtP0xitgh1ZyR 8c7YNHBmKXrqeZSkll5B+knSKmrwIjGxM+dkRxZwY5muFxKFvVlH8XP7jaVUplXqEWyV VM0RdkCEE4hvA5Qr3okUXnwJgmIBfVqzuwPFEOn/ecCAuSIjZGwKzTHdnI8Uoo3ybHr0 ALE7+XXUR38vid4L8XLuQnaE+VfN9d8Ke2Or3M7B7e47mLsVswSdsezmVtKmmJDJqAy1 Kzfw== X-Gm-Message-State: AKGB3mKIkynIv12dVrm5A84SRW3vlqCWJkQiq4C14XbQyf0MbsxSWtFB XEZX4PQDjf3ZpGjqgPDM+8V00Q== X-Google-Smtp-Source: AGs4zMbgIIQVoYBzZl3u8rUoHt6O30LVjD4ORZPuEMso+IEZnghHUhbSp8V2YTEjM9RnO2YWNt9WfQ== X-Received: by 10.28.203.197 with SMTP id b188mr9898158wmg.105.1512503111546; Tue, 05 Dec 2017 11:45:11 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:b595:9d9d:56de:88e3? (p200300EA8BC0E400B5959D9D56DE88E3.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:b595:9d9d:56de:88e3]) by smtp.googlemail.com with ESMTPSA id 88sm861514wrf.20.2017.12.05.11.45.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 11:45:11 -0800 (PST) From: Heiner Kallweit Subject: [PATCH resubmit 1/2] 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: Message-ID: <19d37e48-0b64-b33c-993a-a1cae39efb54@gmail.com> Date: Tue, 5 Dec 2017 20:44:54 +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 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: Peter Rosin --- Documentation/driver-model/devres.txt | 3 +++ drivers/i2c/i2c-core-base.c | 39 +++++++++++++++++++++++++++++++++++ include/linux/i2c.h | 3 +++ 3 files changed, 45 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 bf52cca87..c1db67f9a 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -820,6 +820,45 @@ 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 (!ret) { + devres_free(dr); + return ERR_PTR(-EBUSY); + } + + *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 a556db976..c27eac1e1 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -383,6 +383,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,