From patchwork Fri Mar 9 14:46:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 131134 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1082243lja; Fri, 9 Mar 2018 06:55:29 -0800 (PST) X-Google-Smtp-Source: AG47ELvI1aWVe4N2B3Qagu/gMoZ5oxz/s6xDyz6ufOXQbuf4v5670Z2IE3Je77+YTk/D+Z8NZnmz X-Received: by 10.99.179.14 with SMTP id i14mr24448597pgf.45.1520607329028; Fri, 09 Mar 2018 06:55:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520607329; cv=none; d=google.com; s=arc-20160816; b=a0Kg10RcnGm955Te8FQQMb/bMl6R3qICXK3XtrFqtiQW+C/Tgi8SMcpPSlj9kOsMB/ o2x1gH6YQLzzpkQk8WUkT/IddYlrHMazuLmGbOQxgY87NlsnBPKB0xJq97oy44aSvggk DRolvwv0HPMbGpSLAOXkqeW7NBI6B40C4ywA3NmMDTIt4ubztcSk4+ClqVLGtJOHs+I5 v1n7wvLoOIlgZjfuUwoaz9P3K1xtW3cQJ20CPup5QcAsqr0XTB0qGgE6suhurbXJ5lV2 k0sY+2V56N/dY/LqAKMRqp8yHrHb5KIwNluTLNgzHyjSlJqS4uUNGSiynXx8TOSxYOFh fGWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=RT33r5HhOvcPJ59VnfxCyDIOhWrlyqcWmOJNk3eMS/4=; b=uM9LfPPt8frZbqtB/FT2bdiESh2oqx6FBEPpqmmYPRnxsv2ucaWa7e8bsKzTpDW+KT XI4OGBgRsIHoX17o+gZ7EEvZCd8YfBgMLrRpslfJLdm9ZfxOPQg5AHCFXnq7+GUYpE8n lCOsUWqhzdkhMKgwohAlyydjzDaPl72WwEUuynYF11oYtItVf1Y//JbprZs+EzlFMU9r veiLR5cuz+Nuj60ad3k6Q4cU9WOJPCLGl1f+WHFj3u8f4yWoOnKqmm/Q/4N2WpXLpUsC nKmgG4iBURuwn194WDMCaM6EypbjcPoryXV0SKu47IyNtis/nDQYA9pIWExpZzUQf4lG G/3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YEu3kEpg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u3-v6si995691plj.207.2018.03.09.06.55.28; Fri, 09 Mar 2018 06:55:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YEu3kEpg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932257AbeCIOud (ORCPT + 28 others); Fri, 9 Mar 2018 09:50:33 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34751 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbeCIOua (ORCPT ); Fri, 9 Mar 2018 09:50:30 -0500 Received: by mail-wm0-f68.google.com with SMTP id a20so3779634wmd.1 for ; Fri, 09 Mar 2018 06:50:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RT33r5HhOvcPJ59VnfxCyDIOhWrlyqcWmOJNk3eMS/4=; b=YEu3kEpg9ftU0mnIZUH6bihm5esPS6wbiM7nAa3I9mCjh5gFwyjahVOmGXhX2ktWZP g4uoFSzpdZZrgBjh9chDuBta8WxNKrAqSO4zX9JJ8+YnavbAig8AEJrBRxNILFJKaWpK d0HtH4hLTJTlTxt3rYCJ4K91vqhDCz1oFaGJ0= 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=RT33r5HhOvcPJ59VnfxCyDIOhWrlyqcWmOJNk3eMS/4=; b=P+DD1LpSZDqYfHzf4cfTtx5MK2RoywObGdXikRtwGoO8C7I1E95OtDg7vOwRwk3vjB wLHweJWmhYxVeevOqxMvIPqS9kquKCxQe2wEzImf4KPCLjJuO2Dsz5bzjOhehSOrK6LN is4Zzvln5cS3Uf7akKJiF6WvCVlbenWfmyW+j+EwueD3cOHzHw38Dc+x6bosHG1zVV7m rbPxfnFB4BAkMPt9EW8j5WMiPOmFR+beAgi2gB+UluPO1bZedBU/gdx9dgF4myjwQyOu e4qBZ/U+kDW96gfKE0cSxG6QJOF8solwYbxOTqw7u3Twmj/IO2d9wN5MJB3yaLnEYwkV 9c4Q== X-Gm-Message-State: AElRT7FiqmVWacfqo35O8tGI+EChTggsq+U/sN7HKcmWByFMDosln5Ua pzlNPXom0x3TFti3FRMudm3vug== X-Received: by 10.28.18.2 with SMTP id 2mr2164891wms.108.1520607029338; Fri, 09 Mar 2018 06:50:29 -0800 (PST) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id u48sm1191901wrb.85.2018.03.09.06.50.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 06:50:28 -0800 (PST) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, srinivas.kandagatla@linaro.org, Andrey Smirnov , Heiko Stuebner , Masahiro Yamada , Carlo Caione , Kevin Hilman , Matthias Brugger , cphealy@gmail.com, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/25] nvmem: Introduce devm_nvmem_(un)register() Date: Fri, 9 Mar 2018 14:46:57 +0000 Message-Id: <20180309144719.29904-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180309144719.29904-1-srinivas.kandagatla@linaro.org> References: <20180309144719.29904-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Smirnov Introduce devm_nvmem_register()/devm_nvmem_unregister() to make .remove() unnecessary in trivial drivers. Cc: Srinivas Kandagatla Cc: Heiko Stuebner Cc: Masahiro Yamada Cc: Carlo Caione Cc: Kevin Hilman Cc: Matthias Brugger Cc: cphealy@gmail.com Cc: linux-kernel@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Andrey Smirnov Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 59 ++++++++++++++++++++++++++++++++++++++++++ include/linux/nvmem-provider.h | 17 ++++++++++++ 2 files changed, 76 insertions(+) -- 2.15.1 diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 99e04cfcc723..b05aa8e81303 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -549,6 +549,65 @@ int nvmem_unregister(struct nvmem_device *nvmem) } EXPORT_SYMBOL_GPL(nvmem_unregister); +static void devm_nvmem_release(struct device *dev, void *res) +{ + WARN_ON(nvmem_unregister(*(struct nvmem_device **)res)); +} + +/** + * devm_nvmem_register() - Register a managed nvmem device for given + * nvmem_config. + * Also creates an binary entry in /sys/bus/nvmem/devices/dev-name/nvmem + * + * @config: nvmem device configuration with which nvmem device is created. + * + * Return: Will be an ERR_PTR() on error or a valid pointer to nvmem_device + * on success. + */ +struct nvmem_device *devm_nvmem_register(struct device *dev, + const struct nvmem_config *config) +{ + struct nvmem_device **ptr, *nvmem; + + ptr = devres_alloc(devm_nvmem_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + nvmem = nvmem_register(config); + + if (!IS_ERR(nvmem)) { + *ptr = nvmem; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return nvmem; +} +EXPORT_SYMBOL_GPL(devm_nvmem_register); + +static int devm_nvmem_match(struct device *dev, void *res, void *data) +{ + struct nvmem_device **r = res; + + return *r == data; +} + +/** + * devm_nvmem_unregister() - Unregister previously registered managed nvmem + * device. + * + * @nvmem: Pointer to previously registered nvmem device. + * + * Return: Will be an negative on error or a zero on success. + */ +int devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem) +{ + return devres_release(dev, devm_nvmem_release, devm_nvmem_match, nvmem); +} +EXPORT_SYMBOL(devm_nvmem_unregister); + + static struct nvmem_device *__nvmem_device_get(struct device_node *np, struct nvmem_cell **cellp, const char *cell_id) diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index b00567a07496..f89598bc4e1c 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -72,6 +72,11 @@ struct nvmem_config { struct nvmem_device *nvmem_register(const struct nvmem_config *cfg); int nvmem_unregister(struct nvmem_device *nvmem); +struct nvmem_device *devm_nvmem_register(struct device *dev, + const struct nvmem_config *cfg); + +int devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem); + #else static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c) @@ -84,5 +89,17 @@ static inline int nvmem_unregister(struct nvmem_device *nvmem) return -ENOSYS; } +static inline struct nvmem_device * +devm_nvmem_register(struct device *dev, const struct nvmem_config *c) +{ + return nvmem_register(c); +} + +static inline int +devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem) +{ + return nvmem_unregister(nvmem); +} + #endif /* CONFIG_NVMEM */ #endif /* ifndef _LINUX_NVMEM_PROVIDER_H */