regulator: Fix regulator_get_error_flags() signature mismatch
PATCH 1/1 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.
--- include/linux/regulator/consumer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/regulator/consumer.h +2 -1
@@ -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 ; }
Signature · 1 line
2.7.4
Quoted 14 lines · David Lechner
The function signature of does not match
regulator_get_error_flags()whenCONFIG_REGULATORis not defined vs. when it is not defined. This makes both declarations match to prevent compiler errors.Signed-off-by David Lechner <[email protected]>--- include/linux/regulator/consumer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)include/linux/regulator/consumer.h +0
-0
include/linux/regulator/consumer.h static inline unsigned int regulator_get_mode(struct regulator *regulator) · line 504
Quoted 8 lines
include/linux/regulator/consumer.h +2
-1@@ -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 ;
ouch, i missed this change when i modified the patch, sorry, and thanks for fixing it David,
Regards,
-Axel.
Quoted 4 lines
include/linux/regulator/consumer.h +0
-1} --2.7.4
Mark Brown
maintainerApplied "regulator: Fix regulator_get_error_flags() signature mismatch" to the regulator tree
In reply to David LechnerThe patch
regulator: Fix regulator_get_error_flags() signature mismatch
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
30103b5b6432a51c3822a26dc340e35d91237f39Mon Sep 17 00:00:00 2001
From: David Lechner <[email protected]>
Date: Sun, 4 Dec 2016 16:52:31 -0600
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.
--- include/linux/regulator/consumer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/regulator/consumer.h +2 -1
@@ -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 ; }
Signature · 1 line
2.10.2