Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4715500pxj; Wed, 12 May 2021 11:33:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrtdKhX9WGxODoowiBiop8fz8jUWYkPy/i7cwt5eFxrBhh1myPCZFTRGqfKhTfWDLpT7ob X-Received: by 2002:a17:907:3e06:: with SMTP id hp6mr38873200ejc.273.1620844388436; Wed, 12 May 2021 11:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620844388; cv=none; d=google.com; s=arc-20160816; b=csMuIfBB2i0sgYTB7URxUhDKfgxkh61X0xs+F6QJFyeogrUAe7grr68EqPkgZB69zu CDmkBsHJfvYMgAY8ShVjcNmXAj/k4A5jPAAlTtaAsP+UG2Ltk2AWzgeD1v76VwqLD+rE bDx2/FxlDr4QPYLRfwRPXHmrzlmZO0sZgvfoUDw/jQeiMGbDYp6stNW5xWU1e2U2pJor w0urTQ1UyXqN5UY9crcQNYQ7m90S/Y+tR0X3rvFm//gaeEaSxo7lp3RmyIjMt9nfAE8z MqbeZkrBTHzhzJc98rB85brmuDLydK1IbyXWqNvkmm5jt51LPSFLZE1codV8LfcvA3WJ 3GKQ== 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=hvRXUKKvs9rBTUBrgi39PPRug/cKhlAJDvJgF9WZdcTmU8jVkytkp6erWpymdypn3P 0Lv1TdShf3Qvu8OupnAO7ChBmcoUuBFjx4hou9qMtS9C8KkdAncMO8+400GPrSBfFeFw OEzxvRivJ8vwX++a+dbq3n5blehDOktng3d1COKxNyjXBlRmiBhw1YAhpX7Wj3xTI+yY ScdSU40pwWqhNLINeqMio1o+xnA44Jceh1A5MWgrObkylENBjYh4gw9FWRgJvUvdUa3e EKFam8R8MuPlSjn996WTnvF52ejCZ1/7ah36wiGZtObKZHB5226vj0KZlNHeF8OXR72N NPbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0fctAAmV; 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 v2si136228edc.531.2021.05.12.11.32.41; Wed, 12 May 2021 11:33:08 -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=0fctAAmV; 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 S1356433AbhELScN (ORCPT + 99 others); Wed, 12 May 2021 14:32:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:55800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243169AbhELQgz (ORCPT ); Wed, 12 May 2021 12:36:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 079AC61CD6; Wed, 12 May 2021 16:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835277; bh=tGCX8tslhtr2FUexM+5GSfcEhS4W6t6okDswa7G7v7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0fctAAmVJeYXCm0/vWnHcKlD3hrV+v18Zid6TCI4rq0hpbJMI6wcWurzXxBPe1Zzo EvEPvxymkOOaH2YPfK0j4to0rV8Qpr4Ri7TcdvTv5agHo4MQrBi63H+ghDMuOdbQi7 UEv/lv5LY/1ECer0iRoivaBPiFTVjxae1bp6S1Og= 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.12 279/677] PM: runtime: Replace inline function pm_runtime_callbacks_present() Date: Wed, 12 May 2021 16:45:25 +0200 Message-Id: <20210512144846.489625218@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@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