From patchwork Tue Nov 17 16:48:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7639711 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B8EC49F2EC for ; Tue, 17 Nov 2015 16:50:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE06820452 for ; Tue, 17 Nov 2015 16:50:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E402A2045A for ; Tue, 17 Nov 2015 16:50:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932329AbbKQQtq (ORCPT ); Tue, 17 Nov 2015 11:49:46 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:62560 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932322AbbKQQto (ORCPT ); Tue, 17 Nov 2015 11:49:44 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0Lmel1-1aXEyt3c8J-00aAKd; Tue, 17 Nov 2015 17:49:16 +0100 From: Arnd Bergmann To: Eduardo Valentin Cc: Kapileshwar Singh , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] thermal: fix thermal_zone_bind_cooling_device prototype Date: Tue, 17 Nov 2015 17:48:52 +0100 Message-ID: <5439003.qQElgLSp5g@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:a13RF1t7s7rMeQrPSORXpEovrpETA89hsaGSVXWC29GpHPoYIyb /kpqYvJK2fgE6TsjxhyGYlfE7gEUufrgJoMoHjFsLCSWFfR/ax+VbSY68VzgOuYuFAy92WE qAKC6px/2eDYJS7rF/m8gDL5oHc3CS8CCiBULGT0nS6/VhDCt61AJjLYK1k7RZBgvR0zSrz DS/ZhRhcksFvlQE7M+/JA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Kmlog9EwYDM=:kZVrNql6oaGcOVfMneTVJp 21zm3jYtJhGmoyWr7QK2w0ixDVEKjekTBO+FeA/5UI0RoCBJqtdZ4Gy+RwWVf7T8Be3IHuexD mEF3nvi/lybiEvrw/l8DwMHW1HZjrcx3g4XXT///zndeuctsgC17HCCKryeXHhIP3tyBw/JeC ll4ICjSSxvR3GB90zxVuBDVE/CNLe6mVk5N5NXtM8+WuIQtXZFRgdiRrpJ/vxOciZqPYZJIMd iozViOd57ien+FdrhVcm8oYvJDlyIZ3gfc+q6dslYbSHpm0AIk5U9vEPaSD6BuLd0gTehMV91 UtmumKYMzXlS/fr4eIgFTsRURqKF+VQeathRVZM8rNm9xonekMRi8wqIY48sHHlD8MwuhsRVX BbXxUT5STGsZd1GfSlOk7fSACjpPeo5tQpy27hPVWQbNodYWUmuA7oWOR1DL+1bolrdnOxlv1 BRKyqYbbDRauAhiuxDJAFMkwS7cL+NeZzDH8kMWlLmg5iFf523uVee3Vq/ml6OHL44BXoFHJz uVIOYX+abwxH29wHRkv5UjJQ1EhlCU3LHwJFivJYgKpFHD6u7/kYcz6z7e+ewTMnIA94rgoXF Dabc40nCPFvucZJ7ZHk+i0bVvg7e1kSnILOPh+3cYgWBX9wx7u86podpq+GRkglMKUQokUNkW iIB5Sg/SvFNwD37rWK1uoKGmgcvxNADkJfG8Kfrm30/iQKmd2iXZAdG2E2IGos1ttN2n0g9VY HwQYUSMS3MkiZaLU Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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") Reviewed-by: Javi Merino --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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,