From patchwork Mon Aug 21 18:24:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 804122 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="q2721PMc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xbhst6F86z9s7m for ; Tue, 22 Aug 2017 04:24:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753352AbdHUSYR (ORCPT ); Mon, 21 Aug 2017 14:24:17 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36907 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753348AbdHUSYR (ORCPT ); Mon, 21 Aug 2017 14:24:17 -0400 Received: by mail-wr0-f196.google.com with SMTP id z91so19197839wrc.4 for ; Mon, 21 Aug 2017 11:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=1f4uzhxe/GLZNvpmOomSAUHILjZcHGBcVj85RfspMnU=; b=q2721PMcE3Xa4MW713vi6yTTGlXQlmqZRl2PwDs/Ro5JHLXxtwj4GFZZE+usYZVEZH j3Fs+2UtGczOx71WiFSmkDjaIl4KeqhkjxcE9ZSVrTIlOhAmtAVnqFOpR3ulUgBxbKE3 7iST7rFDckXe6ZY4EgrlLUz5uwY5ACPkG6tQEUn0RPKAE/R45IM0Z+VIdUkHt+QHG1z7 vSHOwWREU2ek54Lj00lT7/k//Q5yPYyUe3Y8vPdJ59as4nKsf4oTKiu9fVEyYUUMuzKe JM7teSr3gHZFd0K7lwywgnqak34I+VU69A4lBOWBycKi/DkPFPHv6RsKG5tibMaw5fdo ff4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=1f4uzhxe/GLZNvpmOomSAUHILjZcHGBcVj85RfspMnU=; b=rHn3DJFJYSev1jsSGzEQJnIIa1qLev2JJcKX7uH04MIL6xdGTDOrFvChqHD6NV/f7O N1QdHCsl1KNK5UjGYI90BVYe8FdETCbI1cnxQomr5r8c6RqS7AQ8eq6A57tD1g7TURGY Um4B9gpq5h8XmJl46H5QkAh8QwNP6iYsSC65amMonGOyftgt+RS7u4LZusnKuXF0EOIJ S2Ti6PerOH2ZcHUqx2fPMcAOLYTl4BkNnvJ9shU15yEfOmsQ/0SvDMmNC/A4AwLRd9YW HK9A7sGG9f050FSO0bS8gjBIdLnzUE4k54JnaAL3SdSz9EIEKXJ9HP1zUIMhb6fELDKo g/9Q== X-Gm-Message-State: AHYfb5iZqKHGVluxT0WLzPyU1408iibYFRAcEbDdT65mKYZRa070J+cw RbDtJ2LPm3FCw9+k X-Received: by 10.223.166.101 with SMTP id k92mr10944870wrc.283.1503339855546; Mon, 21 Aug 2017 11:24:15 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc7:5e00:89d3:17e1:dce5:4ef6? (p200300EA8BC75E0089D317E1DCE54EF6.dip0.t-ipconnect.de. [2003:ea:8bc7:5e00:89d3:17e1:dce5:4ef6]) by smtp.googlemail.com with ESMTPSA id b13sm11015235wmi.7.2017.08.21.11.24.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Aug 2017 11:24:15 -0700 (PDT) To: Wolfram Sang Cc: "linux-i2c@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH] i2c: core: add device-managed version of i2c_new_dummy Message-ID: Date: Mon, 21 Aug 2017 20:24:07 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 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. Signed-off-by: Heiner Kallweit --- drivers/i2c/i2c-core-base.c | 29 +++++++++++++++++++++++++++++ include/linux/i2c.h | 3 +++ 2 files changed, 32 insertions(+) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 12822a4b..7eb48328 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -868,6 +868,35 @@ 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); +} + +/* managed version of i2c_new_dummy */ +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 NULL; + + ret = i2c_new_dummy(adapter, address); + if (!ret) { + devres_free(dr); + return NULL; + } + + *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 d501d395..d0c091e6 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -381,6 +381,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,