public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] reset: Add (devm_)reset_control_get stub functions
@ 2015-08-31 23:56 Axel Lin
  2015-09-01  8:04 ` Philipp Zabel
  0 siblings, 1 reply; 4+ messages in thread
From: Axel Lin @ 2015-08-31 23:56 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: Mark Brown, Takashi Iwai, linux-kernel

So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
v2: Add __must_check and WARN_ON(1); And make it return ERR_PTR(-EINVAL).

 include/linux/reset.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/include/linux/reset.h b/include/linux/reset.h
index da5602b..7f65f9c 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -74,6 +74,20 @@ static inline int device_reset_optional(struct device *dev)
 	return -ENOSYS;
 }
 
+static inline struct reset_control *__must_check reset_control_get(
+					struct device *dev, const char *id)
+{
+	WARN_ON(1);
+	return ERR_PTR(-EINVAL);
+}
+
+static inline struct reset_control *__must_check devm_reset_control_get(
+					struct device *dev, const char *id)
+{
+	WARN_ON(1);
+	return ERR_PTR(-EINVAL);
+}
+
 static inline struct reset_control *reset_control_get_optional(
 					struct device *dev, const char *id)
 {
-- 
1.9.1




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

* Re: [PATCH v2] reset: Add (devm_)reset_control_get stub functions
  2015-08-31 23:56 [PATCH v2] reset: Add (devm_)reset_control_get stub functions Axel Lin
@ 2015-09-01  8:04 ` Philipp Zabel
  2015-09-01 13:13   ` Mark Brown
  0 siblings, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2015-09-01  8:04 UTC (permalink / raw)
  To: Axel Lin; +Cc: Mark Brown, Takashi Iwai, linux-kernel

Am Dienstag, den 01.09.2015, 07:56 +0800 schrieb Axel Lin:
> So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Applied, thanks.

regards
Philipp


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

* Re: [PATCH v2] reset: Add (devm_)reset_control_get stub functions
  2015-09-01  8:04 ` Philipp Zabel
@ 2015-09-01 13:13   ` Mark Brown
  2015-09-01 13:14     ` Takashi Iwai
  0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2015-09-01 13:13 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: Axel Lin, Takashi Iwai, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

On Tue, Sep 01, 2015 at 10:04:36AM +0200, Philipp Zabel wrote:
> Am Dienstag, den 01.09.2015, 07:56 +0800 schrieb Axel Lin:
> > So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled.

> > Signed-off-by: Axel Lin <axel.lin@ingics.com>

> Applied, thanks.

Takashi, this should be enough for the build error in ASoC to be fixed
by the time -rc1 comes out I expect.  Thanks Axel & Philipp.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

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

* Re: [PATCH v2] reset: Add (devm_)reset_control_get stub functions
  2015-09-01 13:13   ` Mark Brown
@ 2015-09-01 13:14     ` Takashi Iwai
  0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2015-09-01 13:14 UTC (permalink / raw)
  To: Mark Brown; +Cc: Philipp Zabel, Axel Lin, linux-kernel

On Tue, 01 Sep 2015 15:13:09 +0200,
Mark Brown wrote:
> 
> On Tue, Sep 01, 2015 at 10:04:36AM +0200, Philipp Zabel wrote:
> > Am Dienstag, den 01.09.2015, 07:56 +0800 schrieb Axel Lin:
> > > So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled.
> 
> > > Signed-off-by: Axel Lin <axel.lin@ingics.com>
> 
> > Applied, thanks.
> 
> Takashi, this should be enough for the build error in ASoC to be fixed
> by the time -rc1 comes out I expect.  Thanks Axel & Philipp.

Yep, I'm going to send a pull request tomorrow :)


Takashi

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

end of thread, other threads:[~2015-09-01 13:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-31 23:56 [PATCH v2] reset: Add (devm_)reset_control_get stub functions Axel Lin
2015-09-01  8:04 ` Philipp Zabel
2015-09-01 13:13   ` Mark Brown
2015-09-01 13:14     ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox