All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20110728055346.GA11921@foobar>

diff --git a/a/1.txt b/N1/1.txt
index dc539db..30b7ea1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,83 +21,3 @@ On 11:57-20110722, Felipe Balbi wrote:
 > bigger, so will the number of helper functions.
 I agree, in fact, on a different topic, I hit the same requirement
 here is the patch I had done:
->From 9f226def811bd50e4bac02f427604034cef77706 Mon Sep 17 00:00:00 2001
-From: Nishanth Menon <nm@ti.com>
-Date: Wed, 27 Jul 2011 15:02:32 -0500
-Subject: [PATCH] OMAP: hwmod: add omap_hwmod_to_device
-
-omap_hwmod_to_device is useful for drivers when they need to
-look up the device associated with a hwmod name to map back
-into the device structure pointers. These ideally should
-be used by drivers in mach directory. This could in effect
-replace apis such as omap2_get_mpuss_device,
-omap2_get_iva_device, omap2_get_l3_device, omap4_get_dsp_device
-etc..
-
-Signed-off-by: Nishanth Menon <nm@ti.com>
----
- arch/arm/mach-omap2/omap_hwmod.c             |   33 ++++++++++++++++++++++++++
- arch/arm/plat-omap/include/plat/omap_hwmod.h |    2 +
- 2 files changed, 35 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 293fa6c..77d01a2 100644
---- a/arch/arm/mach-omap2/omap_hwmod.c
-+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -142,6 +142,7 @@
- #include "powerdomain.h"
- #include <plat/clock.h>
- #include <plat/omap_hwmod.h>
-+#include <plat/omap_device.h>
- #include <plat/prcm.h>
- 
- #include "cm2xxx_3xxx.h"
-@@ -2369,3 +2370,35 @@ int omap_hwmod_no_setup_reset(struct omap_hwmod *oh)
- 
- 	return 0;
- }
-+
-+/**
-+ * omap_hwmod_to_device() - convert a hwmod name to device pointer
-+ * @oh_name: name of the hwmod device
-+ *
-+ * returns back a struct device * pointer associated with a hwmod
-+ * device represented by a hwmod_name
-+ */
-+struct device *omap_hwmod_to_device(const char *oh_name)
-+{
-+	struct omap_hwmod *oh;
-+
-+	if (!oh_name) {
-+		WARN(1, "%s: no hwmod name!\n", __func__);
-+		return ERR_PTR(-EINVAL);
-+	}
-+
-+	oh = _lookup(oh_name);
-+	if (IS_ERR_OR_NULL(oh)) {
-+		WARN(1, "%s: no hwmod for %s\n", __func__,
-+			oh_name);
-+		return ERR_PTR(-ENODEV);
-+	}
-+	if (IS_ERR_OR_NULL(oh->od)) {
-+		WARN(1, "%s: no omap_device for %s\n", __func__,
-+			oh_name);
-+		return ERR_PTR(-ENODEV);
-+	}
-+
-+	return &oh->od->pdev.dev;
-+}
-+EXPORT_SYMBOL(omap_hwmod_to_device);
-diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
-index 1adea9c..b9eec08 100644
---- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
-+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
-@@ -611,4 +611,6 @@ extern int omap2430_hwmod_init(void);
- extern int omap3xxx_hwmod_init(void);
- extern int omap44xx_hwmod_init(void);
- 
-+extern struct device *omap_hwmod_to_device(const char *oh_name);
-+
- #endif
--- 
-1.7.4.1
diff --git a/a/content_digest b/N1/content_digest
index 572397b..50acdab 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,17 +1,10 @@
  "ref\01311292338-11830-1-git-send-email-khilman@ti.com\0"
  "ref\01311292338-11830-4-git-send-email-khilman@ti.com\0"
  "ref\020110722085716.GI32058@legolas.emea.dhcp.ti.com\0"
- "From\0Nishanth Menon <nm@ti.com>\0"
- "Subject\0Re: [RFC/PATCH 2/7] OMAP3: beagle: don't touch omap_device internals\0"
+ "From\0nm@ti.com (Nishanth Menon)\0"
+ "Subject\0[RFC/PATCH 2/7] OMAP3: beagle: don't touch omap_device internals\0"
  "Date\0Thu, 28 Jul 2011 00:53:47 -0500\0"
- "To\0Felipe Balbi <balbi@ti.com>\0"
- "Cc\0Kevin Hilman <khilman@ti.com>"
-  Paul Walmsley <paul@pwsan.com>
-  G. Manjunath Kondaiah <manjugk@ti.com>
-  devicetree-discuss@lists.ozlabs.org
-  Grant Likely <grant.likely@secretlab.ca>
-  linux-omap@vger.kernel.org
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On 11:57-20110722, Felipe Balbi wrote:\n"
@@ -36,86 +29,6 @@
  "> there are already four devices to be gotten, if that number grows any\n"
  "> bigger, so will the number of helper functions.\n"
  "I agree, in fact, on a different topic, I hit the same requirement\n"
- "here is the patch I had done:\n"
- ">From 9f226def811bd50e4bac02f427604034cef77706 Mon Sep 17 00:00:00 2001\n"
- "From: Nishanth Menon <nm@ti.com>\n"
- "Date: Wed, 27 Jul 2011 15:02:32 -0500\n"
- "Subject: [PATCH] OMAP: hwmod: add omap_hwmod_to_device\n"
- "\n"
- "omap_hwmod_to_device is useful for drivers when they need to\n"
- "look up the device associated with a hwmod name to map back\n"
- "into the device structure pointers. These ideally should\n"
- "be used by drivers in mach directory. This could in effect\n"
- "replace apis such as omap2_get_mpuss_device,\n"
- "omap2_get_iva_device, omap2_get_l3_device, omap4_get_dsp_device\n"
- "etc..\n"
- "\n"
- "Signed-off-by: Nishanth Menon <nm@ti.com>\n"
- "---\n"
- " arch/arm/mach-omap2/omap_hwmod.c             |   33 ++++++++++++++++++++++++++\n"
- " arch/arm/plat-omap/include/plat/omap_hwmod.h |    2 +\n"
- " 2 files changed, 35 insertions(+), 0 deletions(-)\n"
- "\n"
- "diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c\n"
- "index 293fa6c..77d01a2 100644\n"
- "--- a/arch/arm/mach-omap2/omap_hwmod.c\n"
- "+++ b/arch/arm/mach-omap2/omap_hwmod.c\n"
- "@@ -142,6 +142,7 @@\n"
- " #include \"powerdomain.h\"\n"
- " #include <plat/clock.h>\n"
- " #include <plat/omap_hwmod.h>\n"
- "+#include <plat/omap_device.h>\n"
- " #include <plat/prcm.h>\n"
- " \n"
- " #include \"cm2xxx_3xxx.h\"\n"
- "@@ -2369,3 +2370,35 @@ int omap_hwmod_no_setup_reset(struct omap_hwmod *oh)\n"
- " \n"
- " \treturn 0;\n"
- " }\n"
- "+\n"
- "+/**\n"
- "+ * omap_hwmod_to_device() - convert a hwmod name to device pointer\n"
- "+ * @oh_name: name of the hwmod device\n"
- "+ *\n"
- "+ * returns back a struct device * pointer associated with a hwmod\n"
- "+ * device represented by a hwmod_name\n"
- "+ */\n"
- "+struct device *omap_hwmod_to_device(const char *oh_name)\n"
- "+{\n"
- "+\tstruct omap_hwmod *oh;\n"
- "+\n"
- "+\tif (!oh_name) {\n"
- "+\t\tWARN(1, \"%s: no hwmod name!\\n\", __func__);\n"
- "+\t\treturn ERR_PTR(-EINVAL);\n"
- "+\t}\n"
- "+\n"
- "+\toh = _lookup(oh_name);\n"
- "+\tif (IS_ERR_OR_NULL(oh)) {\n"
- "+\t\tWARN(1, \"%s: no hwmod for %s\\n\", __func__,\n"
- "+\t\t\toh_name);\n"
- "+\t\treturn ERR_PTR(-ENODEV);\n"
- "+\t}\n"
- "+\tif (IS_ERR_OR_NULL(oh->od)) {\n"
- "+\t\tWARN(1, \"%s: no omap_device for %s\\n\", __func__,\n"
- "+\t\t\toh_name);\n"
- "+\t\treturn ERR_PTR(-ENODEV);\n"
- "+\t}\n"
- "+\n"
- "+\treturn &oh->od->pdev.dev;\n"
- "+}\n"
- "+EXPORT_SYMBOL(omap_hwmod_to_device);\n"
- "diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h\n"
- "index 1adea9c..b9eec08 100644\n"
- "--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h\n"
- "+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h\n"
- "@@ -611,4 +611,6 @@ extern int omap2430_hwmod_init(void);\n"
- " extern int omap3xxx_hwmod_init(void);\n"
- " extern int omap44xx_hwmod_init(void);\n"
- " \n"
- "+extern struct device *omap_hwmod_to_device(const char *oh_name);\n"
- "+\n"
- " #endif\n"
- "-- \n"
- 1.7.4.1
+ here is the patch I had done:
 
-debb8a45077a7495c283d85fdb2e7f639199d76bfb55422c0cdba3c37a8017a6
+e5c4c8b4e929dd09f44effe3dee7e22813cf4c67549e047da55253b2cefdd38d

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.