From nobody Mon Feb 9 05:13:46 2026 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 785C2329E5B for ; Tue, 16 Dec 2025 10:06:50 +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=1765879612; cv=none; b=ByifWg84ewtke9olyvyCfP5JW/pnWZb8uXfKPYO3fkKqzO1PatTLtMqpZUn8vrc/CWVhYL/s7yedEKziSeda+p5ZUvaOgf6BfDDjXij3E7/UmSmvWWMGvZxKFXZkmTf8wfOvgEkkYFawxNfDb+vKoirhm4G/vWkLRyVQgZt0Spw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765879612; c=relaxed/simple; bh=zpPqOItmNkA+ucegC6bDOiLh2rlfcLuhnu7VUOek/5U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=HX21QpFZzgRPK8SDFzd+8POpO9wKTUEzAzDoOqwhIoyliQhte4stt1pOpZ/saSQk75Vq4bs03zbRvGofiJ/oHAKeJnPfM9lPKDruLU2G2wR3xbEd2J+NcVE3RcAsDxWMmRPo+AK7RZF3CJOOXJbivDdmEIJWiXGoQBiLyeEINzg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DAA5C4CEF1; Tue, 16 Dec 2025 10:06:47 +0000 (UTC) From: Geert Uytterhoeven To: Anup Patel , Thomas Gleixner , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Yong-Xuan Wang , Cyan Yang , Nutty Liu , Nick Hu , Thierry Reding , "Rafael J . Wysocki" Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] irqchip/riscv-aplic: Pass context data to syscore callbacks Date: Tue, 16 Dec 2025 11:06:41 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On RISC-V: drivers/irqchip/irq-riscv-aplic-main.c:111:20: error: initialization of= =E2=80=98int (*)(void *)=E2=80=99 from incompatible pointer type =E2=80=98= int (*)(void)=E2=80=99 [-Werror=3Dincompatible-pointer-types] 111 | .suspend =3D aplic_syscore_suspend, | ^~~~~~~~~~~~~~~~~~~~~ drivers/irqchip/irq-riscv-aplic-main.c:111:20: note: (near initializati= on for =E2=80=98aplic_syscore_ops.suspend=E2=80=99) drivers/irqchip/irq-riscv-aplic-main.c:112:19: error: initialization of= =E2=80=98void (*)(void *)=E2=80=99 from incompatible pointer type =E2=80= =98void (*)(void)=E2=80=99 [-Werror=3Dincompatible-pointer-types] 112 | .resume =3D aplic_syscore_resume, | ^~~~~~~~~~~~~~~~~~~~ drivers/irqchip/irq-riscv-aplic-main.c:112:19: note: (near initializati= on for =E2=80=98aplic_syscore_ops.resume=E2=80=99) drivers/irqchip/irq-riscv-aplic-main.c: In function =E2=80=98aplic_prob= e=E2=80=99: drivers/irqchip/irq-riscv-aplic-main.c:375:17: error: implicit declarat= ion of function =E2=80=98register_syscore_ops=E2=80=99; did you mean =E2=80= =98register_syscore=E2=80=99? [-Werror=3Dimplicit-function-declaration] 375 | register_syscore_ops(&aplic_syscore_ops); | ^~~~~~~~~~~~~~~~~~~~ | register_syscore Fix this by updating the driver for the syscore API changes in commit a97fbc3ee3e2a536 ("syscore: Pass context data to callbacks"). Fixes: 1c546bb433618843 ("irqchip/riscv-aplic: Preserve APLIC states across= suspend/resume") Signed-off-by: Geert Uytterhoeven --- Commit a97fbc3ee3e2a536 is in v6.19-rc1, which is now the base for irqchip/irq/drivers. --- drivers/irqchip/irq-riscv-aplic-main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-r= iscv-aplic-main.c index b760942e57f916d8..4495ca26abf5712d 100644 --- a/drivers/irqchip/irq-riscv-aplic-main.c +++ b/drivers/irqchip/irq-riscv-aplic-main.c @@ -89,7 +89,7 @@ static void aplic_save_states(struct aplic_priv *priv) } } =20 -static int aplic_syscore_suspend(void) +static int aplic_syscore_suspend(void *data) { struct aplic_priv *priv; =20 @@ -99,7 +99,7 @@ static int aplic_syscore_suspend(void) return 0; } =20 -static void aplic_syscore_resume(void) +static void aplic_syscore_resume(void *data) { struct aplic_priv *priv; =20 @@ -112,6 +112,10 @@ static struct syscore_ops aplic_syscore_ops =3D { .resume =3D aplic_syscore_resume, }; =20 +static struct syscore aplic_syscore =3D { + .ops =3D &aplic_syscore_ops, +}; + static int aplic_pm_notifier(struct notifier_block *nb, unsigned long acti= on, void *data) { struct aplic_priv *priv =3D container_of(nb, struct aplic_priv, genpd_nb); @@ -372,7 +376,7 @@ static int aplic_probe(struct platform_device *pdev) dev_err_probe(dev, rc, "failed to setup APLIC in %s mode\n", msi_mode ? "MSI" : "direct"); else - register_syscore_ops(&aplic_syscore_ops); + register_syscore(&aplic_syscore); =20 #ifdef CONFIG_ACPI if (!acpi_disabled) --=20 2.43.0