diff options
| author | Arnd Bergmann <[email protected]> | 2021-01-29 16:33:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2021-01-29 16:33:06 +0100 |
| commit | ed8878041a0a2923ea9fbd4b7cc77f9fd7d12f17 (patch) | |
| tree | dc8daa1f3491db9724983efac593179c1ec23e28 | |
| parent | e53686bbdfd2af7e63e3c0f296632c3a428c317a (diff) | |
| parent | 320f6f90cbe4818cf0d0f9441772d23aa441c506 (diff) | |
Merge tag 'omap-for-v5.12/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
SoC changes for omaps for v5.12 merge window
Update email address for Roger and fix a typo
* tag 'omap-for-v5.12/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: fix spellint typo
MAINTAINERS: Update address for OMAP GPMC driver
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/clockdomain.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cc1e6a5ee6e6..d9e8cef48552 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12892,7 +12892,7 @@ S: Orphan F: drivers/video/fbdev/omap/ OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT -M: Roger Quadros <[email protected]> +M: Roger Quadros <[email protected]> M: Tony Lindgren <[email protected]> S: Maintained diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c index dedd47e30b98..1feb0098705e 100644 --- a/arch/arm/mach-omap2/clockdomain.c +++ b/arch/arm/mach-omap2/clockdomain.c @@ -1299,7 +1299,7 @@ int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh) * Due to a suspend or hibernation operation, the state of the registers * controlling this clkdm will be lost, save their context. */ -static int _clkdm_save_context(struct clockdomain *clkdm, void *ununsed) +static int _clkdm_save_context(struct clockdomain *clkdm, void *unused) { if (!arch_clkdm || !arch_clkdm->clkdm_save_context) return -EINVAL; @@ -1312,7 +1312,7 @@ static int _clkdm_save_context(struct clockdomain *clkdm, void *ununsed) * * Restore the register values for this clockdomain. */ -static int _clkdm_restore_context(struct clockdomain *clkdm, void *ununsed) +static int _clkdm_restore_context(struct clockdomain *clkdm, void *unused) { if (!arch_clkdm || !arch_clkdm->clkdm_restore_context) return -EINVAL; |