From patchwork Wed Sep 12 07:51:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10596927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D9837921 for ; Wed, 12 Sep 2018 07:57:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB215296A2 for ; Wed, 12 Sep 2018 07:57:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF3C129927; Wed, 12 Sep 2018 07:57:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 363DA296A2 for ; Wed, 12 Sep 2018 07:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=JWo4b7LYDzLmm1Qo5AeqgCBh/roaIOS0AzFW2ljPXz4=; b=UAbNnheBUowL0trYSvHda+uxvB 1USIy8rLRPmRILWKwSkMrMjqpjit4D22TNJgRhsaMklIsWzgovgdg4Y3C23ts+ZWn1pqmYdSLY82u 8N1Fbe/x4Oou0bM4vl19GOu4R1nit3wXSQm/2/aKA3hDMydLiYO6juz57MV4QbSO0xj44Ep2eTzuY BIDB8L1XNi6zkGQ3Sh9xQPvwmQF2Zvf354r+V+kskJs2xWdQicrDDv6iAEdAddmB9vW4dqHndKWhv +dSTaHfBZU5cTrWIlZO0NmSwQxDeuTZhP4cSv4iw8OzT514Hafr3JLhPsqIAO6XeYi2M1GcDftxLE XGfYJ4Xg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g001H-0007wO-Fp; Wed, 12 Sep 2018 07:57:03 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fzzwT-0004Pt-Vq for linux-arm-kernel@lists.infradead.org; Wed, 12 Sep 2018 07:52:08 +0000 Received: by mail-wr1-x444.google.com with SMTP id g33-v6so937814wrd.1 for ; Wed, 12 Sep 2018 00:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ItU0oQ7oWgVAhdtVOsH1jZ2YSN2mvMhQOChLXBHLTVc=; b=QKerVmLgEa9MhPpA5DrugeHfPPXHbPbl3lysNUipRnwfLAvdZCXFaKOpP1fHWrSbxA 1t0WY5c7PxqYiiBvmyAjjm4V7zZDLaAWEkCOobFzZJAzRsruKhWFO3cKVt70PhYlP2kc JYFjWfdjuDTHqjwoodzmsrr1DmxF+5hk3OY3GGi7ZVsHY2aJvYHU54Slsm7VZBsL95F6 xvcIl0fXUDy2CPRz7ZXn+QHKs4VZxF44r8nliNieuLpmeQH0q9zvD7S22UqSkie8Y3Of QHUNsWKAbbr6cxRSLYIVHQrCWk8tf46Gq3AE5XOA3bVYPSYY6qN3nVQWZCBn576/WW2f 4PlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ItU0oQ7oWgVAhdtVOsH1jZ2YSN2mvMhQOChLXBHLTVc=; b=kTkS6RIReopxMOmTPj6UoZsjJ3xs+mJeEKaniJCnDvobeVrmIhY944W16xcdLNkD9e pIY1ISm3bYlgmxpP49Xw3H3xmcOqFl462J9c72xb7VAACEp5H7OFoJ639VMaFCSpAmyz MRrot+lIjqxE/9win4wBg9W9YHtRVphvJT2kaOcItK9PnFFk2bMdv3MgxKHXDLmIP6Ae nAoLYDmUX8UeKWGnJTlsxn+4tAKd9gx/NOlZQcxpWkoTTkOzoQYZTcmpFr15sRDvv/zI 4xGdVbdEcD/nyCOaa8uWlA4WV811ATxo5Of8WXjRjL9qx2qDETsNIrlg53ofMzyGIpFS kmEA== X-Gm-Message-State: APzg51BcdlNMfJqOFwqvs15tDprVfoCm8JsRAS2k0drEonypMr93O5bZ I5AsD8ocq2pKkmqs03gOWg8RVQ== X-Google-Smtp-Source: ANB0VdY3f4r+JIaMf98kujtiUQkmCan31/qtBuY/3w1ab+18PE5Y+YRrYfsMDJ+uoGbT+WJMhij57Q== X-Received: by 2002:adf:a644:: with SMTP id k62-v6mr521369wrc.78.1536738714185; Wed, 12 Sep 2018 00:51:54 -0700 (PDT) Received: from brgl-bgdev.lan (LFbn-MAR-1-609-89.w90-118.abo.wanadoo.fr. [90.118.185.89]) by smtp.gmail.com with ESMTPSA id l7-v6sm169341wrt.67.2018.09.12.00.51.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 00:51:53 -0700 (PDT) From: Bartosz Golaszewski To: Srinivas Kandagatla , "David S . Miller" , Mauro Carvalho Chehab , Greg Kroah-Hartman , Andrew Morton , Arnd Bergmann , Jonathan Corbet , Sekhar Nori , Kevin Hilman , David Lechner , Boris Brezillon , Andrew Lunn , Alban Bedel , Maxime Ripard , Chen-Yu Tsai Subject: [PATCH v3 06/21] nvmem: use kref Date: Wed, 12 Sep 2018 09:51:14 +0200 Message-Id: <20180912075129.25185-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180912075129.25185-1-brgl@bgdev.pl> References: <20180912075129.25185-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180912_005206_206830_27E6540B X-CRM114-Status: GOOD ( 17.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Use kref for reference counting. Use an approach similar to the one seen in the common clock subsystem: don't actually destroy the nvmem device until the last user puts it. This way we can get rid of the users check from nvmem_unregister(). Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ffed8fa16936..552ffedce38e 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,7 @@ struct nvmem_device { int stride; int word_size; int id; - int users; + struct kref refcnt; size_t size; bool read_only; int flags; @@ -463,6 +464,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) return ERR_PTR(rval); } + kref_init(&nvmem->refcnt); + nvmem->id = rval; nvmem->owner = config->owner; if (!nvmem->owner && config->dev->driver) @@ -532,6 +535,20 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) } EXPORT_SYMBOL_GPL(nvmem_register); +static void nvmem_device_release(struct kref *kref) +{ + struct nvmem_device *nvmem; + + nvmem = container_of(kref, struct nvmem_device, refcnt); + + if (nvmem->flags & FLAG_COMPAT) + device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); + + nvmem_device_remove_all_cells(nvmem); + device_del(&nvmem->dev); + put_device(&nvmem->dev); +} + /** * nvmem_unregister() - Unregister previously registered nvmem device * @@ -541,19 +558,7 @@ EXPORT_SYMBOL_GPL(nvmem_register); */ int nvmem_unregister(struct nvmem_device *nvmem) { - mutex_lock(&nvmem_mutex); - if (nvmem->users) { - mutex_unlock(&nvmem_mutex); - return -EBUSY; - } - mutex_unlock(&nvmem_mutex); - - if (nvmem->flags & FLAG_COMPAT) - device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); - - nvmem_device_remove_all_cells(nvmem); - device_del(&nvmem->dev); - put_device(&nvmem->dev); + kref_put(&nvmem->refcnt, nvmem_device_release); return 0; } @@ -647,7 +652,6 @@ static struct nvmem_device *__nvmem_device_get(struct device_node *np, } } - nvmem->users++; mutex_unlock(&nvmem_mutex); if (!try_module_get(nvmem->owner)) { @@ -655,22 +659,18 @@ static struct nvmem_device *__nvmem_device_get(struct device_node *np, "could not increase module refcount for cell %s\n", nvmem_dev_name(nvmem)); - mutex_lock(&nvmem_mutex); - nvmem->users--; - mutex_unlock(&nvmem_mutex); - return ERR_PTR(-EINVAL); } + kref_get(&nvmem->refcnt); + return nvmem; } static void __nvmem_device_put(struct nvmem_device *nvmem) { module_put(nvmem->owner); - mutex_lock(&nvmem_mutex); - nvmem->users--; - mutex_unlock(&nvmem_mutex); + kref_put(&nvmem->refcnt, nvmem_device_release); } static struct nvmem_device *nvmem_find(const char *name)