From: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Frank Rowand
<frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Greg Kroah-Hartman
<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>,
Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 06/22] nvmem: core: Use of_device_match()
Date: Mon, 6 Jun 2016 10:31:48 +0200 [thread overview]
Message-ID: <20160606083204.19760-7-thierry.reding@gmail.com> (raw)
In-Reply-To: <20160606083204.19760-1-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Use the common implementation rather than the subsystem-specific one.
Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
drivers/nvmem/core.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 965911d9b36a..c4062fb39522 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -23,6 +23,7 @@
#include <linux/nvmem-consumer.h>
#include <linux/nvmem-provider.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/slab.h>
struct nvmem_device {
@@ -263,11 +264,6 @@ static struct bus_type nvmem_bus_type = {
.name = "nvmem",
};
-static int of_nvmem_match(struct device *dev, void *nvmem_np)
-{
- return dev->of_node == nvmem_np;
-}
-
static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np)
{
struct device *d;
@@ -275,7 +271,7 @@ static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np)
if (!nvmem_np)
return NULL;
- d = bus_find_device(&nvmem_bus_type, NULL, nvmem_np, of_nvmem_match);
+ d = bus_find_device(&nvmem_bus_type, NULL, nvmem_np, of_device_match);
if (!d)
return NULL;
--
2.8.3
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-06-06 8:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 8:31 [PATCH 00/22] of: Introduce of_match_device() Thierry Reding
2016-06-06 8:31 ` [PATCH 02/22] amba: tegra-ahb: Use of_device_match() Thierry Reding
2016-06-06 18:51 ` Frank Rowand
2016-06-06 8:31 ` [PATCH 03/22] coresight: " Thierry Reding
2016-06-06 8:31 ` [PATCH 04/22] i2c: core: " Thierry Reding
2016-06-06 8:31 ` [PATCH 05/22] net: cpsw-phy-sel: " Thierry Reding
2016-06-06 8:31 ` [PATCH 07/22] of/platform: " Thierry Reding
2016-06-06 8:31 ` [PATCH 08/22] spi: " Thierry Reding
2016-06-06 8:31 ` [PATCH 09/22] of: mdio: " Thierry Reding
2016-06-06 8:31 ` [PATCH 11/22] usb: phy: isp1301: " Thierry Reding
2016-06-06 8:31 ` [PATCH 12/22] drm/hdlcd: " Thierry Reding
[not found] ` <20160606083204.19760-1-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-06-06 8:31 ` [PATCH 01/22] of: Implement of_match_device() Thierry Reding
2016-06-06 8:31 ` Thierry Reding [this message]
2016-06-06 8:31 ` [PATCH 10/22] usb: phy: am335x-control: Use of_device_match() Thierry Reding
2016-06-06 8:31 ` [PATCH 13/22] drm/armada: " Thierry Reding
2016-06-06 8:31 ` [PATCH 14/22] drm/etnaviv: " Thierry Reding
2016-06-06 8:31 ` [PATCH 15/22] drm/hisilicon: " Thierry Reding
2016-06-06 8:31 ` [PATCH 16/22] drm/mediatek: " Thierry Reding
2016-06-06 8:31 ` [PATCH 17/22] drm/msm: " Thierry Reding
2016-06-06 8:32 ` [PATCH 18/22] drm/rockchip: " Thierry Reding
2016-06-06 8:32 ` [PATCH 19/22] drm/sti: " Thierry Reding
2016-06-06 8:32 ` [PATCH 20/22] drm/sun4i: " Thierry Reding
2016-06-06 8:32 ` [PATCH 21/22] drm/tilcdc: " Thierry Reding
2016-06-06 8:32 ` [PATCH 22/22] iommu/mediatek: " Thierry Reding
2016-06-06 18:50 ` [PATCH 00/22] of: Introduce of_match_device() Frank Rowand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160606083204.19760-7-thierry.reding@gmail.com \
--to=thierry.reding-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).