diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-11 13:48:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-11 13:48:49 +0100 |
| commit | f464252181dc146220e0fb80b08b4fb4e4093288 (patch) | |
| tree | fee49561321bf01dbdbf8c7e131d51986efc1872 /drivers/memory | |
| parent | 168b322e36c5f8903f31d89f34355004920b5e00 (diff) | |
| parent | 321b36c79c431957c8c599a9f9640096c305cd03 (diff) | |
| download | linux-f464252181dc146220e0fb80b08b4fb4e4093288.tar.gz linux-f464252181dc146220e0fb80b08b4fb4e4093288.tar.bz2 linux-f464252181dc146220e0fb80b08b4fb4e4093288.zip | |
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>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/samsung/exynos5422-dmc.c | 4 | ||||
| -rw-r--r-- | drivers/memory/tegra/tegra186-emc.c | 12 | ||||
| -rw-r--r-- | drivers/memory/ti-emif-pm.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/memory/samsung/exynos5422-dmc.c b/drivers/memory/samsung/exynos5422-dmc.c index c5ee4121a4d2..1dabb509dec3 100644 --- a/drivers/memory/samsung/exynos5422-dmc.c +++ b/drivers/memory/samsung/exynos5422-dmc.c @@ -278,7 +278,7 @@ static int exynos5_counters_disable_edev(struct exynos5_dmc *dmc) } /** - * find_target_freq_id() - Finds requested frequency in local DMC configuration + * find_target_freq_idx() - Finds requested frequency in local DMC configuration * @dmc: device for which the information is checked * @target_rate: requested frequency in KHz * @@ -998,7 +998,7 @@ static struct devfreq_dev_profile exynos5_dmc_df_profile = { }; /** - * exynos5_dmc_align_initial_frequency() - Align initial frequency value + * exynos5_dmc_align_init_freq() - Align initial frequency value * @dmc: device for which the frequency is going to be set * @bootloader_init_freq: initial frequency set by the bootloader in KHz * diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c index fa8af17b0e2d..d65e7c2a580b 100644 --- a/drivers/memory/tegra/tegra186-emc.c +++ b/drivers/memory/tegra/tegra186-emc.c @@ -125,9 +125,9 @@ static int tegra186_emc_debug_min_rate_set(void *data, u64 rate) return 0; } -DEFINE_SIMPLE_ATTRIBUTE(tegra186_emc_debug_min_rate_fops, - tegra186_emc_debug_min_rate_get, - tegra186_emc_debug_min_rate_set, "%llu\n"); +DEFINE_DEBUGFS_ATTRIBUTE(tegra186_emc_debug_min_rate_fops, + tegra186_emc_debug_min_rate_get, + tegra186_emc_debug_min_rate_set, "%llu\n"); static int tegra186_emc_debug_max_rate_get(void *data, u64 *rate) { @@ -155,9 +155,9 @@ static int tegra186_emc_debug_max_rate_set(void *data, u64 rate) return 0; } -DEFINE_SIMPLE_ATTRIBUTE(tegra186_emc_debug_max_rate_fops, - tegra186_emc_debug_max_rate_get, - tegra186_emc_debug_max_rate_set, "%llu\n"); +DEFINE_DEBUGFS_ATTRIBUTE(tegra186_emc_debug_max_rate_fops, + tegra186_emc_debug_max_rate_get, + tegra186_emc_debug_max_rate_set, "%llu\n"); static int tegra186_emc_probe(struct platform_device *pdev) { diff --git a/drivers/memory/ti-emif-pm.c b/drivers/memory/ti-emif-pm.c index 6c747c1e98cb..179fec2da56d 100644 --- a/drivers/memory/ti-emif-pm.c +++ b/drivers/memory/ti-emif-pm.c @@ -340,7 +340,7 @@ static struct platform_driver ti_emif_driver = { .remove = ti_emif_remove, .driver = { .name = KBUILD_MODNAME, - .of_match_table = of_match_ptr(ti_emif_of_match), + .of_match_table = ti_emif_of_match, .pm = &ti_emif_pm_ops, }, }; |