From c02da4e69209ac59de406e22129ef29094c3867c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Nov 2023 14:30:07 +0000 Subject: [PATCH] Revert "mfd: core: Un-constify mfd_cell.of_reg" This reverts commit 9f831533d2d094b7e6774bd127dcc92ee3ed6ebc which is commit 3c70342f1f0045dc827bb2f02d814ce31e0e0d05 upstream. It breaks the Android ABI and if it is really needed can come back in the future in an ABI-safe way. Bug: 161946584 Change-Id: I31531da478d4a3e87c532ab9c85980415e07b945 Signed-off-by: Greg Kroah-Hartman --- include/linux/mfd/core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index 8974c7142c94..4b35baa14d30 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h @@ -92,7 +92,7 @@ struct mfd_cell { * (above) when matching OF nodes with devices that have identical * compatible strings */ - u64 of_reg; + const u64 of_reg; /* Set to 'true' to use 'of_reg' (above) - allows for of_reg=0 */ bool use_of_reg;