]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
regulator: Fix regulator_get_error_flags() signature mismatch
authorDavid Lechner <david@lechnology.com>
Sun, 4 Dec 2016 22:52:31 +0000 (16:52 -0600)
committerMark Brown <broonie@kernel.org>
Mon, 5 Dec 2016 11:38:30 +0000 (11:38 +0000)
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
include/linux/regulator/consumer.h

index 528eb1f5273e259c7ea7c81db3e43f235ad6b40c..ea0fffa5faebb1688ecdb6166db8c7f4d2836c40 100644 (file)
@@ -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;
 }