From: Chen-Yu Tsai <wens@csie.org>
To: Srinivas Kandagatla <srinivas.kandagatla@st.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: Chen-Yu Tsai <wens@csie.org>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
Emilio Lopez <emilio@elopez.com.ar>,
Mike Turquette <mturquette@linaro.org>
Subject: [PATCH v2 01/16] reset: add non CONFIG_RESET_CONTROLLER routines
Date: Fri, 10 Jan 2014 15:00:02 +0800 [thread overview]
Message-ID: <1389337217-29032-2-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1389337217-29032-1-git-send-email-wens@csie.org>
Some drivers are shared between platforms that may or may not
have RESET_CONTROLLER selected for them. Add dummy functions
when RESET_CONTROLLER is not selected, thereby eliminating the
need for drivers to enclose reset_control_*() calls within
#ifdef CONFIG_RESET_CONTROLLER, #endif
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
include/linux/reset.h | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/include/linux/reset.h b/include/linux/reset.h
index 6082247..38aa616 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -4,6 +4,8 @@
struct device;
struct reset_control;
+#ifdef CONFIG_RESET_CONTROLLER
+
int reset_control_reset(struct reset_control *rstc);
int reset_control_assert(struct reset_control *rstc);
int reset_control_deassert(struct reset_control *rstc);
@@ -14,4 +16,41 @@ struct reset_control *devm_reset_control_get(struct device *dev, const char *id)
int device_reset(struct device *dev);
+#else /* !CONFIG_RESET_CONTROLLER */
+
+static inline int reset_control_reset(struct reset_control *rstc)
+{
+ return 0;
+}
+
+static inline int reset_control_assert(struct reset_control *rstc)
+{
+ return 0;
+}
+
+static inline int reset_control_deassert(struct reset_control *rstc)
+{
+ return 0;
+}
+
+static inline struct reset_control *reset_control_get(struct device *dev,
+ const char *id)
+{
+ return NULL;
+}
+static inline void reset_control_put(struct reset_control *rstc) {}
+
+static inline struct reset_control *devm_reset_control_get(struct device *dev,
+ const char *id)
+{
+ return NULL;
+}
+
+static inline int device_reset(struct device *dev)
+{
+ return 0;
+}
+
+#endif
+
#endif
--
1.8.5.2
next prev parent reply other threads:[~2014-01-10 7:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-10 7:00 [PATCH v2 00/16] net: stmmac: Add Allwinner A20 GMAC ethernet controller glue layer Chen-Yu Tsai
2014-01-10 7:00 ` Chen-Yu Tsai [this message]
2014-01-10 13:30 ` [PATCH v2 01/16] reset: add non CONFIG_RESET_CONTROLLER routines Philipp Zabel
2014-01-17 3:46 ` Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 02/16] net: stmmac: Enable stmmac main clock when probing hardware Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 03/16] net: stmmac: Add support for optional reset control Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 04/16] net: stmmac: Allocate and pass soc/board specific data to callbacks Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 05/16] blackfin: Update stmmac callback signatures Chen-Yu Tsai
2014-01-10 20:47 ` Sergei Shtylyov
2014-01-10 7:00 ` [PATCH v2 06/16] net: stmmac: Honor DT parameter to force DMA store and forward mode Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 07/16] net: stmmac: Use driver data and callbacks tied with compatible strings Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 08/16] net: stmmac: sunxi platform extensions for GMAC in Allwinner A20 SoC's Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 09/16] clk: sunxi: Add Allwinner A20/A31 GMAC clock unit Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 10/16] ARM: dts: sun7i: Add GMAC clock node to sun7i DTSI Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 11/16] ARM: dts: sun7i: Add GMAC controller " Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 12/16] ARM: dts: sun7i: Add pin muxing options for the GMAC Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 13/16] ARM: dts: sun7i: cubietruck: Enable " Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 14/16] ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 15/16] ARM: dts: sun7i: olinuxino-micro: " Chen-Yu Tsai
2014-01-10 7:00 ` [PATCH v2 16/16] ARM: dts: sun7i: Add ethernet alias for GMAC Chen-Yu Tsai
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=1389337217-29032-2-git-send-email-wens@csie.org \
--to=wens@csie.org \
--cc=emilio@elopez.com.ar \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=peppe.cavallaro@st.com \
--cc=rob.herring@calxeda.com \
--cc=srinivas.kandagatla@st.com \
/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
all inboxes | Powered by JetHome®