[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1480891951-19399-1-git-send-email-david@lechnology.com>
Date: Sun, 4 Dec 2016 16:52:31 -0600
From: David Lechner <david@...hnology.com>
To: Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>
Cc: David Lechner <david@...hnology.com>, linux-kernel@...r.kernel.org,
Axel Haslam <ahaslam@...libre.com>
Subject: [PATCH] regulator: Fix regulator_get_error_flags() signature mismatch
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@...hnology.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
Powered by blists - more mailing lists