linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/1] mfd: syscon: return -ENOSYS if CONFIG_MFD_SYSCON is not enabled
@ 2013-10-22  8:46 Peter Chen
  2013-10-22  9:07 ` Lee Jones
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Chen @ 2013-10-22  8:46 UTC (permalink / raw)
  To: linux-arm-kernel

Some platforms may not define CONFIG_MFD_SYSCON (or haven't syscon),
it can fix build error for these platforms.

Signed-off-by: Peter Chen <peter.chen@freescale.com>

---

Changes for v2:
- Using #ifdef instead of IS_ENABLED
- Using ENOSYS instead of ENXIO as return val

 include/linux/mfd/syscon.h |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h
index b473577..8789fa3 100644
--- a/include/linux/mfd/syscon.h
+++ b/include/linux/mfd/syscon.h
@@ -17,10 +17,35 @@
 
 struct device_node;
 
+#ifdef CONFIG_MFD_SYSCON
 extern struct regmap *syscon_node_to_regmap(struct device_node *np);
 extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s);
 extern struct regmap *syscon_regmap_lookup_by_pdevname(const char *s);
 extern struct regmap *syscon_regmap_lookup_by_phandle(
 					struct device_node *np,
 					const char *property);
+#else
+static inline struct regmap *syscon_node_to_regmap(struct device_node *np)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
+static inline struct regmap *syscon_regmap_lookup_by_compatible(const char *s)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
+static inline struct regmap *syscon_regmap_lookup_by_pdevname(const char *s)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
+static inline struct regmap *syscon_regmap_lookup_by_phandle(
+					struct device_node *np,
+					const char *property)
+{
+	return ERR_PTR(-ENOSYS);
+}
+#endif
+
 #endif /* __LINUX_MFD_SYSCON_H__ */
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH v2 1/1] mfd: syscon: return -ENOSYS if CONFIG_MFD_SYSCON is not enabled
  2013-10-22  8:46 [PATCH v2 1/1] mfd: syscon: return -ENOSYS if CONFIG_MFD_SYSCON is not enabled Peter Chen
@ 2013-10-22  9:07 ` Lee Jones
  0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2013-10-22  9:07 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, 22 Oct 2013, Peter Chen wrote:

> Some platforms may not define CONFIG_MFD_SYSCON (or haven't syscon),
> it can fix build error for these platforms.
> 
> Signed-off-by: Peter Chen <peter.chen@freescale.com>
> 
> ---
> 
> Changes for v2:
> - Using #ifdef instead of IS_ENABLED
> - Using ENOSYS instead of ENXIO as return val
> 
>  include/linux/mfd/syscon.h |   25 +++++++++++++++++++++++++
>  1 files changed, 25 insertions(+), 0 deletions(-)

Applied, thanks.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-10-22  9:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-22  8:46 [PATCH v2 1/1] mfd: syscon: return -ENOSYS if CONFIG_MFD_SYSCON is not enabled Peter Chen
2013-10-22  9:07 ` Lee Jones

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).