diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-14 12:50:12 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-14 12:50:26 +0300 |
| commit | b3f81739ab2acb8416ad58568240d39f0cef3f51 (patch) | |
| tree | 8ec4bd4031554c05cce2b553bfe5510654ec804e /arch/arm/mach-shmobile/pm-r8a7779.c | |
| parent | 63f346937bdb52c09c87b10ca4ccd664a66c7fb8 (diff) | |
| parent | bd82aff9192dad2bfd3cb3fc19fdf741c2f6028e (diff) | |
| download | linux-b3f81739ab2acb8416ad58568240d39f0cef3f51.tar.xz | |
Merge tag 'renesas-pm-domain-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC PM Domain Updates for v4.3" from Simon Horman:
* Make rcar_sysc_ch const for r8a779[09] SoCs
* Get rid of on_off_fn() function pointer
* Use BIT() macro instead of open coding
* Make struct rcar_sysc_ch * parameters const
* Break infinite loop
* Shrink rcar_sysc_ch size
* Improve documentation
* tag 'renesas-pm-domain-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7790: Make struct rcar_sysc_ch const
ARM: shmobile: r8a7779: Make struct rcar_sysc_ch const
ARM: shmobile: R-Car: Get rid of on_off_fn() function pointer
ARM: shmobile: R-Car: Use BIT() macro instead of open coding
ARM: shmobile: R-Car: Make struct rcar_sysc_ch * parameters const
ARM: shmobile: R-Car: Break infinite loop
ARM: shmobile: R-Car: Shrink rcar_sysc_ch size
ARM: shmobile: R-Car: Improve documentation
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/pm-r8a7779.c')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7779.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c index d5f258e4d890..47a862e7f8ba 100644 --- a/arch/arm/mach-shmobile/pm-r8a7779.c +++ b/arch/arm/mach-shmobile/pm-r8a7779.c @@ -35,7 +35,8 @@ struct r8a7779_pm_domain { struct rcar_sysc_ch ch; }; -static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d) +static inline +const struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d) { return &container_of(d, struct r8a7779_pm_domain, genpd)->ch; } |