To prepare for supporting boot-time page size selection, refactor code to remove assumptions about PAGE_SIZE being compile-time constant. Code intended to be equivalent when compile-time page size is active. Wrap global variables that are initialized with PAGE_SIZE derived values using DEFINE_GLOBAL_PAGE_SIZE_VAR() so their initialization can be deferred for boot-time page size builds. Signed-off-by: Ryan Roberts <ryan.roberts@xxxxxxx> --- ***NOTE*** Any confused maintainers may want to read the cover note here for context: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@xxxxxxx/ sound/soc/soc-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 303823dc45d7a..74e1bc1087de4 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -98,7 +98,7 @@ int snd_soc_tdm_params_to_bclk(const struct snd_pcm_hw_params *params, } EXPORT_SYMBOL_GPL(snd_soc_tdm_params_to_bclk); -static const struct snd_pcm_hardware dummy_dma_hardware = { +static DEFINE_GLOBAL_PAGE_SIZE_VAR_CONST(struct snd_pcm_hardware, dummy_dma_hardware, { /* Random values to keep userspace happy when checking constraints */ .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER, @@ -107,7 +107,7 @@ static const struct snd_pcm_hardware dummy_dma_hardware = { .period_bytes_max = PAGE_SIZE*2, .periods_min = 2, .periods_max = 128, -}; +}); static const struct snd_soc_component_driver dummy_platform; -- 2.43.0
