From: David Lechner <david@lechnology.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: David Lechner <david@lechnology.com>,
linux-kernel@vger.kernel.org, Axel Haslam <ahaslam@baylibre.com>
Subject: [PATCH] regulator: Fix regulator_get_error_flags() signature mismatch
Date: Sun, 4 Dec 2016 16:52:31 -0600 [thread overview]
Message-ID: <1480891951-19399-1-git-send-email-david@lechnology.com> (raw)
The function signature of does not match regulator_get_error_flags()
when CONFIG_REGULATOR is not defined vs. when it is not defined.
This makes both declarations match to prevent compiler errors.
Signed-off-by: David Lechner <david@lechnology.com>
---
include/linux/regulator/consumer.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 528eb1f..ea0fffa 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -498,7 +498,8 @@ static inline unsigned int regulator_get_mode(struct regulator *regulator)
return REGULATOR_MODE_NORMAL;
}
-static inline int regulator_get_error_flags(struct regulator *regulator)
+static inline int regulator_get_error_flags(struct regulator *regulator,
+ unsigned int *flags)
{
return -EINVAL;
}
--
2.7.4
next reply other threads:[~2016-12-04 22:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 22:52 David Lechner [this message]
2016-12-05 11:23 ` Axel Haslam
2016-12-05 12:09 ` Applied "regulator: Fix regulator_get_error_flags() signature mismatch" to the regulator tree Mark Brown
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=1480891951-19399-1-git-send-email-david@lechnology.com \
--to=david@lechnology.com \
--cc=ahaslam@baylibre.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.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
Powered by JetHome