Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751613AbcLELYK (ORCPT ); Mon, 5 Dec 2016 06:24:10 -0500 Received: from mail-qk0-f182.google.com ([209.85.220.182]:34059 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476AbcLELYJ (ORCPT ); Mon, 5 Dec 2016 06:24:09 -0500 MIME-Version: 1.0 In-Reply-To: <1480891951-19399-1-git-send-email-david@lechnology.com> References: <1480891951-19399-1-git-send-email-david@lechnology.com> From: Axel Haslam Date: Mon, 5 Dec 2016 12:23:27 +0100 Message-ID: Subject: Re: [PATCH] regulator: Fix regulator_get_error_flags() signature mismatch To: David Lechner Cc: Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1171 Lines: 34 On Sun, Dec 4, 2016 at 11:52 PM, David Lechner wrote: > 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 > --- > 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; ouch, i missed this change when i modified the patch, sorry, and thanks for fixing it David, Regards, -Axel. > } > -- > 2.7.4 >