diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 20:51:26 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 20:51:26 +0100 |
| commit | 19cf6e6d402a7732d39570afcdd3b8a0a66df652 (patch) | |
| tree | 803a7743d13292d5863b18981e8e32c48772ed25 /drivers/clk | |
| parent | 629c96256de49257b72407ebd256343938234cfa (diff) | |
| parent | 4c44274ee457e3f7012dc532c8c9cc8964a82612 (diff) | |
Merge tag 'samsung-drivers-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers
Samsung SoC drivers changes for v5.11, part two
1. Mark PM functions of newly added clkout module as unused to silence
!CONFIG_PM warnings.
2. Initialize ChipID driver later - in arch initcall.
* tag 'samsung-drivers-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
clk: samsung: mark PM functions as __maybe_unused
soc: samsung: exynos-chipid: initialize later - with arch_initcall
soc: samsung: exynos-chipid: order list of SoCs by name
Link: https://lore.kernel.org/r/20201207074528.4475-1-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/samsung/clk-exynos-clkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk-exynos-clkout.c b/drivers/clk/samsung/clk-exynos-clkout.c index 9ec2f40cc400..e6d6cbf8c4e6 100644 --- a/drivers/clk/samsung/clk-exynos-clkout.c +++ b/drivers/clk/samsung/clk-exynos-clkout.c @@ -207,7 +207,7 @@ static int exynos_clkout_remove(struct platform_device *pdev) return 0; } -static int exynos_clkout_suspend(struct device *dev) +static int __maybe_unused exynos_clkout_suspend(struct device *dev) { struct exynos_clkout *clkout = dev_get_drvdata(dev); @@ -216,7 +216,7 @@ static int exynos_clkout_suspend(struct device *dev) return 0; } -static int exynos_clkout_resume(struct device *dev) +static int __maybe_unused exynos_clkout_resume(struct device *dev) { struct exynos_clkout *clkout = dev_get_drvdata(dev); |