diff mbox series

[v1] clk, reset: microchip: mpfs: fix incorrect preprocessor conditions

Message ID 20240508-unabashed-cheese-8f645b4f69ba@spud (mailing list archive)
State Accepted, archived
Headers show
Series [v1] clk, reset: microchip: mpfs: fix incorrect preprocessor conditions | expand

Commit Message

Conor Dooley May 8, 2024, 9:33 p.m. UTC 
From: Conor Dooley <conor.dooley@microchip.com>

While moving all the reset code in the PolarFire SoC clock driver to the
reset subsystem, I removed an `#if IS_ENABLED(RESET_CONTROLLER)` from
the driver and moved it to the header, however this was not the correct
thing to do. In the driver such a condition over-eagerly provided a
complete implementation for mpfs_reset_{read,write}() when the reset
subsystem was enabled without the PolarFire SoC reset driver, but in the
header it meant that when the subsystem was enabled and the driver was
not, no implementation for mpfs_reset_controller_register() was
provided. Fix the condition so that the stub implementation of
mpfs_reset_controller_register() is used when the reset driver is
disabled.

Fixes: 098c290a490d ("clock, reset: microchip: move all mpfs reset code to the reset subsystem")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202405082259.44DzHvaN-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202405082200.tBrEs5CZ-lkp@intel.com/
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
CC: Conor Dooley <conor.dooley@microchip.com>
CC: Daire McNamara <daire.mcnamara@microchip.com>
CC: Stephen Boyd <sboyd@kernel.org>
CC: linux-clk@vger.kernel.org
CC: linux-kernel@vger.kernel.org
---
 include/soc/microchip/mpfs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stephen Boyd May 9, 2024, 1:39 a.m. UTC | #1 
Quoting Conor Dooley (2024-05-08 14:33:24)
> From: Conor Dooley <conor.dooley@microchip.com>
> 
> While moving all the reset code in the PolarFire SoC clock driver to the
> reset subsystem, I removed an `#if IS_ENABLED(RESET_CONTROLLER)` from
> the driver and moved it to the header, however this was not the correct
> thing to do. In the driver such a condition over-eagerly provided a
> complete implementation for mpfs_reset_{read,write}() when the reset
> subsystem was enabled without the PolarFire SoC reset driver, but in the
> header it meant that when the subsystem was enabled and the driver was
> not, no implementation for mpfs_reset_controller_register() was
> provided. Fix the condition so that the stub implementation of
> mpfs_reset_controller_register() is used when the reset driver is
> disabled.
> 
> Fixes: 098c290a490d ("clock, reset: microchip: move all mpfs reset code to the reset subsystem")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202405082259.44DzHvaN-lkp@intel.com/
> Closes: https://lore.kernel.org/oe-kbuild-all/202405082200.tBrEs5CZ-lkp@intel.com/
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---

Applied to clk-next
diff mbox series

Patch

diff --git a/include/soc/microchip/mpfs.h b/include/soc/microchip/mpfs.h
index d7e612b5e22e..0bd67e10b704 100644
--- a/include/soc/microchip/mpfs.h
+++ b/include/soc/microchip/mpfs.h
@@ -43,11 +43,11 @@  struct mtd_info *mpfs_sys_controller_get_flash(struct mpfs_sys_controller *mpfs_
 #endif /* if IS_ENABLED(CONFIG_POLARFIRE_SOC_SYS_CTRL) */
 
 #if IS_ENABLED(CONFIG_MCHP_CLK_MPFS)
-#if IS_ENABLED(CONFIG_RESET_CONTROLLER)
+#if IS_ENABLED(CONFIG_RESET_POLARFIRE_SOC)
 int mpfs_reset_controller_register(struct device *clk_dev, void __iomem *base);
 #else
 static inline int mpfs_reset_controller_register(struct device *clk_dev, void __iomem *base) { return 0; }
-#endif /* if IS_ENABLED(CONFIG_RESET_CONTROLLER) */
+#endif /* if IS_ENABLED(CONFIG_RESET_POLARFIRE_SOC) */
 #endif /* if IS_ENABLED(CONFIG_MCHP_CLK_MPFS) */
 
 #endif /* __SOC_MPFS_H__ */