From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751804AbcLEMLM (ORCPT ); Mon, 5 Dec 2016 07:11:12 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:39994 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751584AbcLEMJ6 (ORCPT ); Mon, 5 Dec 2016 07:09:58 -0500 From: Mark Brown To: David Lechner Cc: Mark Brown , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, Axel Haslam , linux-kernel@vger.kernel.org In-Reply-To: <1480891951-19399-1-git-send-email-david@lechnology.com> Message-Id: Date: Mon, 05 Dec 2016 12:09:46 +0000 X-SA-Exim-Connect-IP: 81.145.183.37 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Applied "regulator: Fix regulator_get_error_flags() signature mismatch" to the regulator tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The 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 >>From 30103b5b6432a51c3822a26dc340e35d91237f39 Mon Sep 17 00:00:00 2001 From: David Lechner 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. Signed-off-by: David Lechner Signed-off-by: Mark Brown --- 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 528eb1f5273e..ea0fffa5faeb 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.10.2