Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4607481pxj; Wed, 12 May 2021 09:08:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0cQKFmMot7ohDx8ky28PEBf8TqZSlvJRDnctmw6itd32wEgfD+0SYZ21NIiK5uBzPBQON X-Received: by 2002:a05:6402:c03:: with SMTP id co3mr43764095edb.133.1620835719518; Wed, 12 May 2021 09:08:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620835719; cv=none; d=google.com; s=arc-20160816; b=MkdZCImIK6pvsAjtAzwh84whUR+9zmyzAX4KOe6mnu4CEbeX59eDumyhTWv9lNg5OK 5b6qn4UeW0e0SYUgauehGnyfTZ1/7WZl2g6a9VbcQnJ0uzPSYjZymcNytkqdug826mLx QIGkqiLJ7FuCLcaPQy5GJ58n2jAuEtYr7JJ7NK/+y9Jk9ZXgFoHuTQAs+XOYBQZDuqC5 FngtM9wKCN6rXXGSd9cSVsvHhEvJu0OG7KZnHO3p0qSjYi4J48yNxUCnqRmH4yDeC9gA KtZwhB0lnQoBkr/INPxNdJHrzYOv36bM8muWxFzIuWOmBMna+CeAa34STO0Ko+DfZ3U0 PPZg== 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=7C3AHPIdnuBOXyEsOaJjfs4BRlg6WHQQZMSrlOBOol4=; b=bUX9EkiEgmDxKHZVNH5hFAEiI5JYA7VubAbQY+AvAdMFclyr7PeAamCxwTJadEx24b lQSE7fyOIIQgfWXnnGM1dMK42GAdjduMdydmyigCZtBuJGl1ackHBPfpU+/iHysgcMbG zbhU+AgoQgm+c5JewJkMG6o+xtua2I13x77TtHo0EoHlHhy01hcl7e/cOwKA9mACEc5t fwWq+LSR2PqEHaHP3by9gqvGw/3Wymy2UyFImZyJt1oNhrmPHQuU6AkAufjRH6/EwXIJ uLUcs+t2kaGTKhQ2pGgq2S6LzaIpGoPXa7xyWNUtkD7DUDg4KRz0i0X+6cljZOTv1O9i 3YXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ewf8tshw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 kb26si391047ejc.352.2021.05.12.09.08.15; Wed, 12 May 2021 09:08:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=ewf8tshw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S238948AbhELQGv (ORCPT + 99 others); Wed, 12 May 2021 12:06:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:40742 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235466AbhELP2F (ORCPT ); Wed, 12 May 2021 11:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1EBFB61452; Wed, 12 May 2021 15:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620832383; bh=tGCX8tslhtr2FUexM+5GSfcEhS4W6t6okDswa7G7v7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ewf8tshwMnkl/fnSKPa81kF8rXoDs8VanReB1dR9u8NNI4nlGWTrNLiTt+2OGUrx4 wJb/vBQnmW5w1kOreKrL8ptxSihT3uLL2N6GiVNImGwu3clmNpQXZi+b62SvT358RE SgMiKMoYc0vGtloG73LrXgYlWieL0w7OJypKkVWU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.10 223/530] PM: runtime: Replace inline function pm_runtime_callbacks_present() Date: Wed, 12 May 2021 16:45:33 +0200 Message-Id: <20210512144827.161657470@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144819.664462530@linuxfoundation.org> References: <20210512144819.664462530@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YueHaibing [ Upstream commit 953c1fd96b1a70bcbbfb10973c2126eba8d891c7 ] Commit 9a7875461fd0 ("PM: runtime: Replace pm_runtime_callbacks_present()") forgot to change the inline version. Fixes: 9a7875461fd0 ("PM: runtime: Replace pm_runtime_callbacks_present()") Signed-off-by: YueHaibing Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- include/linux/pm_runtime.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index b492ae00cc90..6c08a085367b 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -265,7 +265,7 @@ static inline void pm_runtime_no_callbacks(struct device *dev) {} static inline void pm_runtime_irq_safe(struct device *dev) {} static inline bool pm_runtime_is_irq_safe(struct device *dev) { return false; } -static inline bool pm_runtime_callbacks_present(struct device *dev) { return false; } +static inline bool pm_runtime_has_no_callbacks(struct device *dev) { return false; } static inline void pm_runtime_mark_last_busy(struct device *dev) {} static inline void __pm_runtime_use_autosuspend(struct device *dev, bool use) {} -- 2.30.2