Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754514AbbKXOiu (ORCPT ); Tue, 24 Nov 2015 09:38:50 -0500 Received: from foss.arm.com ([217.140.101.70]:34429 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754479AbbKXOis (ORCPT ); Tue, 24 Nov 2015 09:38:48 -0500 Date: Tue, 24 Nov 2015 14:38:45 +0000 From: Javi Merino To: Arnd Bergmann Cc: Eduardo Valentin , Kapileshwar Singh , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] thermal: fix thermal_zone_bind_cooling_device prototype Message-ID: <20151124143844.GA17897@e104805> References: <5439003.qQElgLSp5g@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <5439003.qQElgLSp5g@wuerfel> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1996 Lines: 46 On Tue, Nov 17, 2015 at 05:48:52PM +0100, Arnd Bergmann wrote: > When the prototype for thermal_zone_bind_cooling_device > changed, the static inline wrapper function was left alone, > which in theory can cause build warnings: > > I have seen this error in the past: > drivers/thermal/db8500_thermal.c: In function 'db8500_cdev_bind': > drivers/thermal/db8500_thermal.c:78:9: error: too many arguments to function 'thermal_zone_bind_cooling_device' > ret = thermal_zone_bind_cooling_device(thermal, i, cdev, > > while this one no longer shows up, there is no doubt that > the prototype is still wrong, so let's just fix it anyway. > > Signed-off-by: Arnd Bergmann > Fixes: 6cd9e9f629f1 ("thermal: of: fix cooling device weights in device tree") Yes, we forgot to fix the case for !THERMAL Reviewed-by: Javi Merino > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > index 4014a59828fc..613c29bd6baf 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -438,7 +438,8 @@ static inline void thermal_zone_device_unregister( > static inline int thermal_zone_bind_cooling_device( > struct thermal_zone_device *tz, int trip, > struct thermal_cooling_device *cdev, > - unsigned long upper, unsigned long lower) > + unsigned long upper, unsigned long lower, > + unsigned int weight) > { return -ENODEV; } > static inline int thermal_zone_unbind_cooling_device( > struct thermal_zone_device *tz, int trip, > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/