Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'memory-controller-drv-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers

Memory controller drivers for v5.12, part two

Two minor cleanups and one fix for compile testing (when !CONFIG_OF).

* tag 'memory-controller-drv-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
memory: tegra186-emc: Replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE
memory: samsung: exynos5422-dmc: Correct function names in kerneldoc
memory: ti-emif-pm: Drop of_match_ptr from of_device_id table

Link: https://lore.kernel.org/r/20210211081829.7317-1-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+9 -9
+2 -2
drivers/memory/samsung/exynos5422-dmc.c
··· 278 278 } 279 279 280 280 /** 281 - * find_target_freq_id() - Finds requested frequency in local DMC configuration 281 + * find_target_freq_idx() - Finds requested frequency in local DMC configuration 282 282 * @dmc: device for which the information is checked 283 283 * @target_rate: requested frequency in KHz 284 284 * ··· 998 998 }; 999 999 1000 1000 /** 1001 - * exynos5_dmc_align_initial_frequency() - Align initial frequency value 1001 + * exynos5_dmc_align_init_freq() - Align initial frequency value 1002 1002 * @dmc: device for which the frequency is going to be set 1003 1003 * @bootloader_init_freq: initial frequency set by the bootloader in KHz 1004 1004 *
+6 -6
drivers/memory/tegra/tegra186-emc.c
··· 125 125 return 0; 126 126 } 127 127 128 - DEFINE_SIMPLE_ATTRIBUTE(tegra186_emc_debug_min_rate_fops, 129 - tegra186_emc_debug_min_rate_get, 130 - tegra186_emc_debug_min_rate_set, "%llu\n"); 128 + DEFINE_DEBUGFS_ATTRIBUTE(tegra186_emc_debug_min_rate_fops, 129 + tegra186_emc_debug_min_rate_get, 130 + tegra186_emc_debug_min_rate_set, "%llu\n"); 131 131 132 132 static int tegra186_emc_debug_max_rate_get(void *data, u64 *rate) 133 133 { ··· 155 155 return 0; 156 156 } 157 157 158 - DEFINE_SIMPLE_ATTRIBUTE(tegra186_emc_debug_max_rate_fops, 159 - tegra186_emc_debug_max_rate_get, 160 - tegra186_emc_debug_max_rate_set, "%llu\n"); 158 + DEFINE_DEBUGFS_ATTRIBUTE(tegra186_emc_debug_max_rate_fops, 159 + tegra186_emc_debug_max_rate_get, 160 + tegra186_emc_debug_max_rate_set, "%llu\n"); 161 161 162 162 static int tegra186_emc_probe(struct platform_device *pdev) 163 163 {
+1 -1
drivers/memory/ti-emif-pm.c
··· 340 340 .remove = ti_emif_remove, 341 341 .driver = { 342 342 .name = KBUILD_MODNAME, 343 - .of_match_table = of_match_ptr(ti_emif_of_match), 343 + .of_match_table = ti_emif_of_match, 344 344 .pm = &ti_emif_pm_ops, 345 345 }, 346 346 };