From patchwork Thu Jan 12 19:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13098780 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B16F2C678D8 for ; Thu, 12 Jan 2023 19:58:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC0648001A; Thu, 12 Jan 2023 14:57:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D49F580017; Thu, 12 Jan 2023 14:57:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EF398001A; Thu, 12 Jan 2023 14:57:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7F5D680017 for ; Thu, 12 Jan 2023 14:57:42 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 61F73806FB for ; Thu, 12 Jan 2023 19:57:42 +0000 (UTC) X-FDA: 80347207164.14.A4FD421 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf08.hostedemail.com (Postfix) with ESMTP id 39293160007 for ; Thu, 12 Jan 2023 19:57:39 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=EXFl9MaM; spf=none (imf08.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673553460; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=4aFpXbTN+2q/sQWoIhQXRuBIzQdX59WKAp/kjFjx5nI=; b=rCD+QOAlhZ6K+++tVKp6bM5k7E+1hnNjeqr9GO35k8cLQXPVzxjqz4djpcGAZQQIX3kwxL Vsf6M82KUra4jUIPvF7sOQNDxItzQN/y1xnG0pW4ztJLe+3NxS6mIQC9YuzqZSG8SgliLv 2L2agnoywUpLOPrKMTggsZogaU1H5IE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=EXFl9MaM; spf=none (imf08.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673553460; a=rsa-sha256; cv=none; b=4Phn5pPag/VTcnW6CceQVCwdsddoyZwUPPzf+4sDfYIIZgpXkCdV5wHTcCdcipxeUPJVFr SM1jrPkCOPON8Bw8xMhIyO/2Pqu8Yk8jJq6oOdEC0gp4jtHpEx/dsU0FIrRDVXJGwK7OeG 9qJcHrVv9PGKEon7DWozsj7r6/Bluyw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=4aFpXbTN+2q/sQWoIhQXRuBIzQdX59WKAp/kjFjx5nI=; b=EXFl9MaMND0FkMicNKlfspElVB huiMp2O7+Fvk4uwlSWk2b77yH7f4axNULDLOvrmgF2stY4NTNGRJ25ZSpXd9goBg/VkJdWWaXP+Gr Of7rP+CRWQSMlE+dfMMiwNu6KPhGmNs+/4kt/1x2eSDBQGLkb7G0JxjG3bjP6egK+5K3BYl2NDXSI EWmjrlA8t5XxbT818dX7+Vt3AqBBUhu093wyPACd2zLypjFT7H2JDrsNcfcD/XHM7W3wj7ZN5Nh6N zG0q4ipZCd55Lg30zpCT0GHj8smeXMq8oSjlRgA598BxbO+Tnb+HSoRDuOLJvyhSzEi1pRgNhbbQw 1dyt/7Iw==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pG3hL-0045pl-2Y; Thu, 12 Jan 2023 19:57:28 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id F297C303465; Thu, 12 Jan 2023 20:57:13 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 4EBB62CD066D0; Thu, 12 Jan 2023 20:57:08 +0100 (CET) Message-ID: <20230112195541.782536366@infradead.org> User-Agent: quilt/0.66 Date: Thu, 12 Jan 2023 20:43:54 +0100 From: Peter Zijlstra To: peterz@infradead.org Cc: richard.henderson@linaro.org, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, linux@armlinux.org.uk, nsekhar@ti.com, brgl@bgdev.pl, ulli.kroll@googlemail.com, linus.walleij@linaro.org, shawnguo@kernel.org, Sascha Hauer , kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, tony@atomide.com, khilman@kernel.org, krzysztof.kozlowski@linaro.org, alim.akhtar@samsung.com, catalin.marinas@arm.com, will@kernel.org, guoren@kernel.org, bcain@quicinc.com, chenhuacai@kernel.org, kernel@xen0n.name, geert@linux-m68k.org, sammy@sammy.net, monstr@monstr.eu, tsbogend@alpha.franken.de, dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, shorne@gmail.com, James.Bottomley@HansenPartnership.com, deller@gmx.de, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, ysato@users.sourceforge.jp, dalias@libc.org, davem@davemloft.net, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, jgross@suse.com, srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, boris.ostrovsky@oracle.com, chris@zankel.net, jcmvbkbc@gmail.com, rafael@kernel.org, lenb@kernel.org, pavel@ucw.cz, gregkh@linuxfoundation.org, mturquette@baylibre.com, sboyd@kernel.org, daniel.lezcano@linaro.org, lpieralisi@kernel.org, sudeep.holla@arm.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, anup@brainfault.org, thierry.reding@gmail.com, jonathanh@nvidia.com, jacob.jun.pan@linux.intel.com, atishp@atishpatra.org, Arnd Bergmann , yury.norov@gmail.com, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, dennis@kernel.org, tj@kernel.org, cl@linux.com, rostedt@goodmis.org, mhiramat@kernel.org, frederic@kernel.org, paulmck@kernel.org, pmladek@suse.com, senozhatsky@chromium.org, john.ogness@linutronix.de, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, Andrew Morton , jpoimboe@kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-xtensa@linux-xtensa.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Ulf Hansson , "Rafael J. Wysocki" Subject: [PATCH v3 40/51] cpuidle,powerdomain: Remove trace_.*_rcuidle() References: <20230112194314.845371875@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 39293160007 X-Stat-Signature: m6zupeqahnkyj9spm1wu5n3g4tpii8cq X-Rspam-User: X-HE-Tag: 1673553459-298222 X-HE-Meta: U2FsdGVkX18vBdO6JwSKiuIGcjN31EXl2IppVgZoVvcCHG+D2eK0y5iFE2lhisUTINAC+rHkCpv/Bxtr0/trZk98LXS5w+6SQxhpJswT5vPr+2t6DbZf20vF97dsrPn5pFQsNptwqxyuGfVCz5SW16fd+fxvz7e4KdS2oRxfhH7k/Flw5MTt3p9JZMdTD++pII/ajB97/OfE1rqio03xLBRdDpXaqr4StpqGmdk2EV6Teud83mQunpem/NWibaV6G+tMuowI9zyo4jiBn7DFXLnL5caL4CVa4INZ9HtQkuR0hJN90FsQk3xFMeOWmo9CBknNq9WXCGUJws2CIOOmzJTZTnPA/E65a4SJCoMJL9HbxCkuIKjTJOV8QAHIjDEtp72+j5GGb/ome/tu3OhwYmZhGTJ+JQPCyUeBWNF2nfQOkNGmu2kcOO03XSFPmmaqvXyMO+WFLCcF2L0jX+rHz00sDOpLX4h46bqQVuBBYm+OIxLauJqEWmCdhgD1lvJK6laVNBx+4ee/s+lMGXwM6jXBTTva5PZbSDqOXHSBzrfNyJaru6Gf1ebFVmXnRE/MgQVlVVrS1tiJjGuOCLRbKXDzKeOETPyk35cboMDn6uXmo54QHNhnA10rzNTNjNOYQHR++9gQSTdvNjFfcLnfwLaSmRgJ1+bhBQuvY6S70vVe52aWVNHs4oZQ1DnODHeZxL0ffK0dB+t7/2+ZXqffXnkOzvo7HdxGm+NqgrQR+Hh22VNyUbb7zjVZafzxjv02Jf2nMpmPQ/1chaS/wirsuSGzEsyC3DZNmI8+Tcs4VvAchDxVnhi/idgMt/upBd05J98YrfKDebNqx6lXdWYShzTS5OMucKmeVKjXq8/geLehAYfrNAuJ8H3uJRi7JDJA2sEmTl+XFjzHCDQ/qIQYXrJP2xU1SPqx8U32w4zGd1HYUCRKcZvjJNgVGnQE/HKOdFyROK7DtKhYXKnG5y5 6Xz3J6/4 pm8nUgqbfhZCuzML8GQsxyLVwkegg0KAvYIyxt/n7y0DqzyuzOWdhFMnO1ffnmPK2KxeE1E0O8GmaXfczV3rh5cfYyYfEG6cr4gUzCJ8nXzQT4zBsFqD04OjK66uyNIu7T/E8sB3hKoSeMRyZ3BX7IrUy8/Z+Fx4Li2NTj7YyQSzsLNDo8XI1vuoqRRPPWT90lUDTYn2DYmG/7IkGMCAHMzasPrB2ZnwY2zpbOUU3EPdui9goq6SHbJCTWg+efKmyu7tKW44dWSV+0OzcvF9N6zZLe1bDQBSVNdR6YG2TsE53Mft0gGNyVvGcNXZx0f/G9iZTyMXETw7jL0P+Q0VkvrKWA4S1Ml0Teq//zgDDGGnUelr97sf875bzU1sMlMlKlwbTT8mqV5seSLTdMcm8N8aoF+D/YJul+zz86HUHhRHiw9zva75NP4rZj5UqNZWkbi7rYe0mUPKS+YZwY7/HPcNckac7MU1MNwcjUky6ztVXUL7zvJjgOm1UEXt2THBHv/uk4FxozSAfFcZSIHQKlSc233oJllUY1K6r+K5WH6dMCxEpexi7jvIZF1xBYBmsyxyXkVD0ucWO8wuCtwyTGmFklpyukzbzb2OEcOtFN1O0WK47Secwm+Soe+yXJDZ9LtOl4uRTT9lEkfWLl1KYJVk83e6CHZbkEw8MSDznaQlJReJEuyUCneqjBxdbaWAfkBAuAY1QRdhMtv9BHnIgg/kVGCwbOjJm2rmcHb2B+r75Xm3M0kiR8gJdZ5/4VbfMuMVq7/ALPVlyeY6xFJuQVkbSDR2Xia60WH3fFXn/la5PPQzR80jVhhoInd61UzERLGgCD0GOuz4n9YOSDiBeNRMPW2wsMdDIZRyc2ZmZ+aMjmAjFTAKTeH2U8snycNEIuincBszhzu2lC6XkUmyuQBFBetC+GNzgi/ifsCxRu+lboLqIgvxYkVtvUEvA2ijJLzdh2MPmT0m/XfdWi8PyeODy/IWk oFBCQgsB TsuomFmelRrXV4IToq0Kp44RrbD1Dseb0MR8iGS/S7rZr3NcTqVBFV8u14DcrtH1nab4DADnX+YdMD5jz6NAAABVrtcVn0hUj0kkG/+X6ApT637JnyphBOto4sOMDXbHOlaoETJRz61G4TBAR+Txkf4uGZ/kR7fy8PX7RL694A1GxOCyNMy6ePlsEdJ0qeElRZXkfjB0ZqufqyDwHPobYbHkEs48Y9OE37vcPSuyjxpOxxqb3/E5R47G11pPuX/d8cMQ1qwCydBN9vpEBkkhOMBipZ55Q8TpzE9mSAeVFc/+iDHDvsUzl+qxMEfSZ+s4L7goTiqefKB7V1O5o1ApWkv6zU84Oj5jDZ+AQoscdJVjU8hZYiMF3wu6iq7Hyh+G+oMcGNnp56N2vncB7RtyN0CmLPe7P+DMdgGIu26puW8IpOPiu50d/uvZ7tjc5FOATrhAtyBBkC7ZoEbKTsQmey0qQNH7FVTdyuouyqftsoECr47OD5CZ2cJdrbkAbMMzP6BrI6Z0OH4c9XqabQfMBSYy3f+G/t7KJ8OyrPb53V6vLjAbXq5zLG5mrpLzrTLaVmPw/ahMxdwmv2A/U1LUn3M+qVHUg5BFDf2RYDZHM9R9UK+0isBIjxvziTrgPIGYlkpxtdYcvz1zz2p+vJjqOo/1xZT39HOhWOoFvCJ+YaDTjKUENoalPr1Mw2LBI2fv25ON1g1TvML7S1y1p4jMtFT0AwrySZclku2GZpf0yC3jzelN7aecenPxfSMC1UKHDxD0NNlvrOUIZ6EZPWfsF9lNEUeX0mrts51s/e6R4F3pDRa+4r18iP7o1xNw22UxnVgOCTiAi59apdaxC8X8tZnj2FRB/PfzBZcdjRJBlSdG0MKpfweiDAVSvn3dAzlU9eH9qmI8kLcNakNcPj0DHS901C81OloudmEKueebS1tfjhLXQf2b5R67ajkJ2PGF7ZFTWdCIMta5R/KaPqWOtjgP4A6ml cYGTvVre NGMRkV1drVR7E0TxrqIU2AOI4oTmwlkpJZJhzadebRQFZEQpSpg00g9TJAIim6Xop39/L8R6/ja2Yey+poV7WYGl2QxpkJwmlgTDDo+2StrpEVeh7Y+41xGdYNfBDsdZPKmindGpjLEg6SEXzXLAJ3HqEuzztuO+jDzVqYPbhaJQWZf+1lRa5CzVpfMbFKm+qS7uqUsWmOjAR/xM6zWt+AwaeF9+o3SGNggBoj98Nw6+tpFmISWTY5SlWbgomAtO/2zaBcQA5GYcmKkbzkxpui1WD+n0szmr6Ju/8d8a36HTsCmGj2z4Xbu4oZ+tZ7oVUSd8ml+C4USW6FehUM1rpmZzaeFDo2S6sAtRnB+b5EkBS/ShwSt0OCM/GfrBStrHZ8Kjy/NR+Sp5WSmwyUqtl3UsmqMuWKDalcYdvP/p1B5mJ3H6ky6wnUzxKmE1x0CpuDv6ggm8hKx3Q68GBV6IV5zbEtjNciSVqGy3Z2NqMx3TirjAcmugIDu/nhedMORN1RyAjEYWoHUIyvbaaNTBuveniFDkE6FEWoEgWiLtaKwKzcetc+IE+UmFew7Xbtn6RX2mEXndD/RvhdtUwHPb623gG9Bf/BSwLnVz0Inn1XTggld/tN/jOX5Lvo/DBwwTNY42xCBDsPF2CCDJ8dGWp2ZKQyfJHJ4qfa8lSuAVjs6L4SJ4Zm1JKaJWpzPLONIDmqGF67clP/krmPWK9vMjTRHrCRmyZYPvEU7Ib5QpAun2LX1rhsp7orjRj46VzdXJeo9eqGGdllKYjN4JwyLZtYAmwct2Y+o2AIxEvOIuSN/Cx3B6xZmuxK7chZ/vvZCe+EhOI5r9Rx36YcS7nL5axaZrvlpMVGARHdglWezEe5N2QCSQh/2o4+GZl4n+sY5qZX6vfDvaZMtIedakfsEnBoeR48R5KdZwV4ErUNZhwbEAgZvt/2csCyA7CwdlphPgu4V5g4U/ayN1nCOOSZdpoebrY45OJ I/BzGkCe clY0n11Hy0m5AZ+8YqnUs+R7cX7wSnxtfWqDM6FEsV1LV+gcX2T5LmdPV10FQNldfU0NiElZnin/qpW2iwEMbXA2gsu2JvQgpV41Ifo3ZHm9XnSxyzZUh04h1sF97a2i6EyL6E5nQ8nkVm40ukp1Jg X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: OMAP was the one and only user. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Ulf Hansson Acked-by: Rafael J. Wysocki Acked-by: Frederic Weisbecker Tested-by: Tony Lindgren Tested-by: Ulf Hansson --- arch/arm/mach-omap2/powerdomain.c | 10 +++++----- drivers/base/power/runtime.c | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -187,9 +187,9 @@ static int _pwrdm_state_switch(struct po trace_state = (PWRDM_TRACE_STATES_FLAG | ((next & OMAP_POWERSTATE_MASK) << 8) | ((prev & OMAP_POWERSTATE_MASK) << 0)); - trace_power_domain_target_rcuidle(pwrdm->name, - trace_state, - raw_smp_processor_id()); + trace_power_domain_target(pwrdm->name, + trace_state, + raw_smp_processor_id()); } break; default: @@ -541,8 +541,8 @@ int pwrdm_set_next_pwrst(struct powerdom if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) { /* Trace the pwrdm desired target state */ - trace_power_domain_target_rcuidle(pwrdm->name, pwrst, - raw_smp_processor_id()); + trace_power_domain_target(pwrdm->name, pwrst, + raw_smp_processor_id()); /* Program the pwrdm desired target state */ ret = arch_pwrdm->pwrdm_set_next_pwrst(pwrdm, pwrst); } --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -442,7 +442,7 @@ static int rpm_idle(struct device *dev, int (*callback)(struct device *); int retval; - trace_rpm_idle_rcuidle(dev, rpmflags); + trace_rpm_idle(dev, rpmflags); retval = rpm_check_suspend_allowed(dev); if (retval < 0) ; /* Conditions are wrong. */ @@ -481,7 +481,7 @@ static int rpm_idle(struct device *dev, dev->power.request_pending = true; queue_work(pm_wq, &dev->power.work); } - trace_rpm_return_int_rcuidle(dev, _THIS_IP_, 0); + trace_rpm_return_int(dev, _THIS_IP_, 0); return 0; } @@ -493,7 +493,7 @@ static int rpm_idle(struct device *dev, wake_up_all(&dev->power.wait_queue); out: - trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); + trace_rpm_return_int(dev, _THIS_IP_, retval); return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); } @@ -557,7 +557,7 @@ static int rpm_suspend(struct device *de struct device *parent = NULL; int retval; - trace_rpm_suspend_rcuidle(dev, rpmflags); + trace_rpm_suspend(dev, rpmflags); repeat: retval = rpm_check_suspend_allowed(dev); @@ -708,7 +708,7 @@ static int rpm_suspend(struct device *de } out: - trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); + trace_rpm_return_int(dev, _THIS_IP_, retval); return retval; @@ -760,7 +760,7 @@ static int rpm_resume(struct device *dev struct device *parent = NULL; int retval = 0; - trace_rpm_resume_rcuidle(dev, rpmflags); + trace_rpm_resume(dev, rpmflags); repeat: if (dev->power.runtime_error) { @@ -925,7 +925,7 @@ static int rpm_resume(struct device *dev spin_lock_irq(&dev->power.lock); } - trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); + trace_rpm_return_int(dev, _THIS_IP_, retval); return retval; } @@ -1081,7 +1081,7 @@ int __pm_runtime_idle(struct device *dev if (retval < 0) { return retval; } else if (retval > 0) { - trace_rpm_usage_rcuidle(dev, rpmflags); + trace_rpm_usage(dev, rpmflags); return 0; } } @@ -1119,7 +1119,7 @@ int __pm_runtime_suspend(struct device * if (retval < 0) { return retval; } else if (retval > 0) { - trace_rpm_usage_rcuidle(dev, rpmflags); + trace_rpm_usage(dev, rpmflags); return 0; } } @@ -1202,7 +1202,7 @@ int pm_runtime_get_if_active(struct devi } else { retval = atomic_inc_not_zero(&dev->power.usage_count); } - trace_rpm_usage_rcuidle(dev, 0); + trace_rpm_usage(dev, 0); spin_unlock_irqrestore(&dev->power.lock, flags); return retval; @@ -1566,7 +1566,7 @@ void pm_runtime_allow(struct device *dev if (ret == 0) rpm_idle(dev, RPM_AUTO | RPM_ASYNC); else if (ret > 0) - trace_rpm_usage_rcuidle(dev, RPM_AUTO | RPM_ASYNC); + trace_rpm_usage(dev, RPM_AUTO | RPM_ASYNC); out: spin_unlock_irq(&dev->power.lock); @@ -1635,7 +1635,7 @@ static void update_autosuspend(struct de atomic_inc(&dev->power.usage_count); rpm_resume(dev, 0); } else { - trace_rpm_usage_rcuidle(dev, 0); + trace_rpm_usage(dev, 0); } }