From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E701A320CAB; Mon, 18 Aug 2025 13:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755524563; cv=none; b=CgiaL3Co3vgoWgxw5HkmRM+o/mZ12xsDYqzbu6C1MLN4dMraihT0y9FhkG8YOoG6NB0gxSDJvoeEfRgt+oQpr2u6okpt0MZMpsbuyJHSfiVI2ryjVcLzmIz2bYr7mfF2oPLk/pfJArdE0sj/L+p1AQ6Ep4y3nQnB5NLtDO7QjjE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755524563; c=relaxed/simple; bh=ko8DNvolq3PmiwBqpzeuTF4CU72ZFPIBHZvLJhwglPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MNRDrCZ1+By5/rokyy0/ErT5I+HpzA435MAGB6ZXsx/AMPZgHLOOZeenawGA4DNlm2XQOLYToNNV+u3hB3IEGRPDERLHjdw81e7TrGj66ekC2zdE423qTm4Uie9lzGAAihzcIXSGhnA0toloKWpyraFERjgw90kxnozCxNVw958= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GLCwU9eg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GLCwU9eg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 659D4C116B1; Mon, 18 Aug 2025 13:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755524562; bh=ko8DNvolq3PmiwBqpzeuTF4CU72ZFPIBHZvLJhwglPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GLCwU9egzy8pvsBhaANSATlm/GATQw4Iink2pvdau7Dntrdcf5+mYqv4Y4rO1ZI88 8vzYDh1Vt2JVFkBERduw9jjdniOf5/afIBCWjPed9DZEpI27iSKrMmRHowDSVuw+gi t38OkaZHAAl2ThyfvlMp+pQdGR/KFpsv0chs4nY4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Peng Fan , Sudeep Holla Subject: [PATCH 6.15 511/515] firmware: arm_scmi: Convert to SYSTEM_SLEEP_PM_OPS Date: Mon, 18 Aug 2025 14:48:17 +0200 Message-ID: <20250818124518.108076341@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann commit 62d6b81e8bd207ad44eff39d1a0fe17f0df510a5 upstream. The old SET_SYSTEM_SLEEP_PM_OPS() macro leads to a warning about an unused function: | drivers/firmware/arm_scmi/scmi_power_control.c:363:12: error: | 'scmi_system_power_resume' defined but not used [-Werror=unused-function] | static int scmi_system_power_resume(struct device *dev) The proper way to do this these days is to use SYSTEM_SLEEP_PM_OPS() and pm_sleep_ptr(). Fixes: 9a0658d3991e ("firmware: arm_scmi: power_control: Ensure SCMI_SYSPOWER_IDLE is set early during resume") Signed-off-by: Arnd Bergmann Acked-by: Peng Fan Message-Id: <20250709070107.1388512-1-arnd@kernel.org> Signed-off-by: Sudeep Holla Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/arm_scmi/scmi_power_control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/firmware/arm_scmi/scmi_power_control.c +++ b/drivers/firmware/arm_scmi/scmi_power_control.c @@ -369,7 +369,7 @@ static int scmi_system_power_resume(stru } static const struct dev_pm_ops scmi_system_power_pmops = { - SET_SYSTEM_SLEEP_PM_OPS(NULL, scmi_system_power_resume) + SYSTEM_SLEEP_PM_OPS(NULL, scmi_system_power_resume) }; static const struct scmi_device_id scmi_id_table[] = { @@ -380,7 +380,7 @@ MODULE_DEVICE_TABLE(scmi, scmi_id_table) static struct scmi_driver scmi_system_power_driver = { .driver = { - .pm = &scmi_system_power_pmops, + .pm = pm_sleep_ptr(&scmi_system_power_pmops), }, .name = "scmi-system-power", .probe = scmi_syspower_probe,