From patchwork Fri Sep 24 12:44:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 514569 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1457122jao; Fri, 24 Sep 2021 06:12:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNZVKdj1E9u9a5TEfrkNgtItDCLwiNE/TaSTFO4sdDkptqT4BiqrRn/z2/l87joVoI0NkE X-Received: by 2002:a5d:8048:: with SMTP id b8mr8862689ior.84.1632489175411; Fri, 24 Sep 2021 06:12:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632489175; cv=none; d=google.com; s=arc-20160816; b=FQEPKtbtvOBtHjg2b1ooedo/LPSF7TOXsajtZCK/1w3pOX8lreWrlv91p4SIWEHyow H5yVnRzDld3kwDvBJIMMIjdrI2MbBR4/262HqXyALuiojcON1oH/gwqEszJFX7XVAlS0 VCoYucpqII1STeLD52o9KvyEVyGK2Jn1VbTaaBzr1ki8aa5w15gJwT3daFnNHlr0c2KA t4BwDYP3g+ZHTA977llYXnESrLyBwTgttv3l2/KKsf1BskCAS/TlyGnNQ11BeGHIjqm6 iALjADjsbadXS7XVal18yVArz7lhRnZmiBzqGcL0wGWXxglRCwIy9hzyPawjOnjQFWRA 0COQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ah3ZRbOkZYNtkPl46uJ7/m6JTUITUBS8zaF0C0d1Nyw=; b=vR40BIN0OUmeAIyVzrmq8ahZuyO2Z/Imx4lUck6/ny3thOPdq/pF6S2eC2tkjAHUk2 Spz8VmlEwKAczt5StnqeynoNp56EdB0cVZUp0WzNqC+B2I7Q+GeeYvH9w8JKt4tQIonQ RbLRwirSqS6+qAmfrRkdVOQ9EhnYgtDJAS18idyBnvd1XNGL1QDjbc5VKWRpBDKvBF0G DnTsvX5DHJHDQaUB3rfTxt9fU5fZ57KX7b+/uVkgMkylKgwvMi5ka2HfMZ8/UQJJmZzI ILpYZUMkfUS/ez+ytnnmkVk5IhcAtT/AmXM+uiEh8rAO42i+A29nI/uLqbM+pBoTnNMc YiDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="L/IagCKp"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m19si11286016jat.15.2021.09.24.06.12.55; Fri, 24 Sep 2021 06:12:55 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="L/IagCKp"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346809AbhIXNOS (ORCPT + 11 others); Fri, 24 Sep 2021 09:14:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:38842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346169AbhIXNMM (ORCPT ); Fri, 24 Sep 2021 09:12:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D3A39613CE; Fri, 24 Sep 2021 12:58:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632488330; bh=YN4sg+A4COQS9FIG8U7VhzOngajLK+jzTcdur6B65n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L/IagCKpgmTfsC55e6MtAAYouh/Yy31YIej9weOHn4LoXHFSdDdWzZ9CcdiT1f/Pz bldaLCSYd1JIAKvJIPggiEwNLvx7x6g/cwI5B8mScXTpYFJqjzqhqdfHD8mhOWqBRL BnUNcBL9d1mhpbXXhVcW2NDTkcXJiB5jCNslddmQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masami Hiramatsu , "Steven Rostedt (VMware)" , Sasha Levin Subject: [PATCH 5.10 33/63] tools/bootconfig: Fix tracing_on option checking in ftrace2bconf.sh Date: Fri, 24 Sep 2021 14:44:33 +0200 Message-Id: <20210924124335.405312246@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924124334.228235870@linuxfoundation.org> References: <20210924124334.228235870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masami Hiramatsu [ Upstream commit 32ba9f0fb027cc43074e3ea26fcf831adeee8e03 ] Since tracing_on indicates only "1" (default) or "0", ftrace2bconf.sh only need to check the value is "0". Link: https://lkml.kernel.org/r/163077087144.222577.6888011847727968737.stgit@devnote2 Fixes: 55ed4560774d ("tools/bootconfig: Add tracing_on support to helper scripts") Signed-off-by: Masami Hiramatsu Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Sasha Levin --- tools/bootconfig/scripts/ftrace2bconf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.33.0 diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh index a0c3bcc6da4f..fb201d5afe2c 100755 --- a/tools/bootconfig/scripts/ftrace2bconf.sh +++ b/tools/bootconfig/scripts/ftrace2bconf.sh @@ -222,8 +222,8 @@ instance_options() { # [instance-name] emit_kv $PREFIX.cpumask = $val fi val=`cat $INSTANCE/tracing_on` - if [ `echo $val | sed -e s/f//g`x != x ]; then - emit_kv $PREFIX.tracing_on = $val + if [ "$val" = "0" ]; then + emit_kv $PREFIX.tracing_on = 0 fi val= From patchwork Fri Sep 24 12:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 514567 Delivered-To: patch@linaro.org Received: by 2002:a17:906:f46:0:0:0:0 with SMTP id h6csp1260799ejj; Fri, 24 Sep 2021 06:09:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwM/uCxEKD8b/JhO4VN+Z1QiceJ6/u1/m9+3mqqmak/2OAiR18ImWyfK8/rggRFv///101y X-Received: by 2002:a05:6e02:1d0c:: with SMTP id i12mr8511297ila.209.1632488987840; Fri, 24 Sep 2021 06:09:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632488987; cv=none; d=google.com; s=arc-20160816; b=p3hRF3kqSUwOXh7alOT4eWpu+bNaTC1adG1AFxl8dewxgBm+UEVYmw3BBRlHnmPdWH uwQf6cyN67VlzQ1k4EY2gxLfAnk0RVvATAMpWKqLqJtrXpOkR97hgSMloe+qBf1udNsa KLlJJPY5EWGUjKinjk4QPszYMWT8dDSxFpyZg0guH2y/nzvj5GnHB56m0584BobX9u8I PnE34CmzJYgXMdB0cqtKfAAU4pgCy5nOno7Hq3U/3+C1WnbWoB7Sx8mydPGQYeh0L6d9 lpy5Aq4OIO2tHXQHq8rKemDCzYaG8LV3KCCzm1ZH9dDxK00zlAoyK46d4MxIjzcu7qwm NTHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rhuIbnXwixvMtZE4SLEHSLozDL9SnHpBD5h4PZjwBPo=; b=kx+3SExptEJ9QmOTghae4U2vFYd2A6nmfDPm1xtFSGRwx+/IdSre3lEvG50wOP9tpj 0JdpPr+nSXBfyxuo9X8CNTp9ENCz8R8v7J/qs0rUxosqWSnOR6f8SewvenuzPW0NT8Dm DlJoi3q+XqkFWyaTv3Zv3ONBHMSfNuX22ddctzZ88aJRibUTjAnOTCfpm0gcqWxKMdQi 0ankH9R16PAJzySSLCKsZKa2YnLlFJkXU8oLps7WE0i+QvWnUZbna3+CaUq9lkCXDlz3 w/0N33RO84SuVDs7OCrUz5DHYDQSYmBQccqQThY3Bp9tVpAP1YbLfSNIUp3AA2z1CAae 1Zmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R1zRLqyM; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g6si8659138ila.86.2021.09.24.06.09.47; Fri, 24 Sep 2021 06:09:47 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R1zRLqyM; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345496AbhIXNLS (ORCPT + 11 others); Fri, 24 Sep 2021 09:11:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:38146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346168AbhIXNJC (ORCPT ); Fri, 24 Sep 2021 09:09:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 35E0B61164; Fri, 24 Sep 2021 12:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632488250; bh=14e0PiiUK3wBz8iI4PjAaXON4iD6D4KwaYFhAGFMPdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R1zRLqyMp4eJW9mHPvYmf/7A1wNryBlZYRIZ88Ev67UJqC7dZ5LAZddC2o3UgnYz6 iKO1rK2us8pSajxMWU8NUb9nQq0lka+XQ/+CiowXniBeDVlcfdm2IKzHYLvMDJAaHM sa7dcD0JLjuNQn5WWO+irQTKhFXXqZ9Sch4PYc/s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Jean-Francois Dagenais , Daniel Lezcano , Sasha Levin Subject: [PATCH 5.10 34/63] thermal/core: Fix thermal_cooling_device_register() prototype Date: Fri, 24 Sep 2021 14:44:34 +0200 Message-Id: <20210924124335.443998105@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924124334.228235870@linuxfoundation.org> References: <20210924124334.228235870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit fb83610762dd5927212aa62a468dd3b756b57a88 ] There are two pairs of declarations for thermal_cooling_device_register() and thermal_of_cooling_device_register(), and only one set was changed in a recent patch, so the other one now causes a compile-time warning: drivers/net/wireless/mediatek/mt76/mt7915/init.c: In function 'mt7915_thermal_init': drivers/net/wireless/mediatek/mt76/mt7915/init.c:134:48: error: passing argument 1 of 'thermal_cooling_device_register' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] 134 | cdev = thermal_cooling_device_register(wiphy_name(wiphy), phy, | ^~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/mediatek/mt76/mt7915/init.c:7: include/linux/thermal.h:407:39: note: expected 'char *' but argument is of type 'const char *' 407 | thermal_cooling_device_register(char *type, void *devdata, | ~~~~~~^~~~ Change the dummy helper functions to have the same arguments as the normal version. Fixes: f991de53a8ab ("thermal: make device_register's type argument const") Signed-off-by: Arnd Bergmann Reviewed-by: Jean-Francois Dagenais Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20210722090717.1116748-1-arnd@kernel.org Signed-off-by: Sasha Levin --- include/linux/thermal.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.33.0 diff --git a/include/linux/thermal.h b/include/linux/thermal.h index d07ea27e72a9..176d9454e8f3 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -410,12 +410,13 @@ static inline void thermal_zone_device_unregister( struct thermal_zone_device *tz) { } static inline struct thermal_cooling_device * -thermal_cooling_device_register(char *type, void *devdata, +thermal_cooling_device_register(const char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { return ERR_PTR(-ENODEV); } static inline struct thermal_cooling_device * thermal_of_cooling_device_register(struct device_node *np, - char *type, void *devdata, const struct thermal_cooling_device_ops *ops) + const char *type, void *devdata, + const struct thermal_cooling_device_ops *ops) { return ERR_PTR(-ENODEV); } static inline struct thermal_cooling_device * devm_thermal_of_cooling_device_register(struct device *dev,