ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2021-02-11 13:48:48 +01:00
parent 168b322e36 321b36c79c
commit f464252181
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/memory/samsung/exynos5422-dmc.c
View File

@@ -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 * @dmc: device for which the information is checked
* @target_rate: requested frequency in KHz * @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 * @dmc: device for which the frequency is going to be set
* @bootloader_init_freq: initial frequency set by the bootloader in KHz * @bootloader_init_freq: initial frequency set by the bootloader in KHz
* *

12
drivers/memory/tegra/tegra186-emc.c
View File

@@ -125,9 +125,9 @@ static int tegra186_emc_debug_min_rate_set(void *data, u64 rate)
return 0; return 0;
} }
DEFINE_SIMPLE_ATTRIBUTE(tegra186_emc_debug_min_rate_fops, DEFINE_DEBUGFS_ATTRIBUTE(tegra186_emc_debug_min_rate_fops,
tegra186_emc_debug_min_rate_get, tegra186_emc_debug_min_rate_get,
tegra186_emc_debug_min_rate_set, "%llu\n"); tegra186_emc_debug_min_rate_set, "%llu\n");
static int tegra186_emc_debug_max_rate_get(void *data, u64 *rate) 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; return 0;
} }
DEFINE_SIMPLE_ATTRIBUTE(tegra186_emc_debug_max_rate_fops, DEFINE_DEBUGFS_ATTRIBUTE(tegra186_emc_debug_max_rate_fops,
tegra186_emc_debug_max_rate_get, tegra186_emc_debug_max_rate_get,
tegra186_emc_debug_max_rate_set, "%llu\n"); tegra186_emc_debug_max_rate_set, "%llu\n");
static int tegra186_emc_probe(struct platform_device *pdev) static int tegra186_emc_probe(struct platform_device *pdev)
{ {

2
drivers/memory/ti-emif-pm.c
View File

@@ -340,7 +340,7 @@ static struct platform_driver ti_emif_driver = {
.remove = ti_emif_remove, .remove = ti_emif_remove,
.driver = { .driver = {
.name = KBUILD_MODNAME, .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, .pm = &ti_emif_pm_ops,
}, },
}; };