lkml.org 
[lkml]   [2014]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 04/11] ARM: s3c64xx: pm: Use name field of generic_pm_domain
Date
This patch removes name field from private s3c64xx_pm_domain struct and
moves domain name to dedicated field of generic_pm_domain struct.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
---
arch/arm/mach-s3c64xx/pm.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index b5a6698..df4b7b2 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -36,7 +36,6 @@
#include "regs-syscon-power.h"

struct s3c64xx_pm_domain {
- char *const name;
u32 ena;
u32 pwr_stat;
struct generic_pm_domain pd;
@@ -77,7 +76,7 @@ static int s3c64xx_pd_on(struct generic_pm_domain *domain)
} while (retry--);

if (!retry) {
- pr_err("Failed to start domain %s\n", pd->name);
+ pr_err("Failed to start domain %s\n", pd->pd.name);
return -EBUSY;
}
}
@@ -86,78 +85,78 @@ static int s3c64xx_pd_on(struct generic_pm_domain *domain)
}

static struct s3c64xx_pm_domain s3c64xx_pm_irom = {
- .name = "IROM",
.ena = S3C64XX_NORMALCFG_IROM_ON,
.pd = {
+ .name = "IROM",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
};

static struct s3c64xx_pm_domain s3c64xx_pm_etm = {
- .name = "ETM",
.ena = S3C64XX_NORMALCFG_DOMAIN_ETM_ON,
.pwr_stat = S3C64XX_BLKPWRSTAT_ETM,
.pd = {
+ .name = "ETM",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
};

static struct s3c64xx_pm_domain s3c64xx_pm_s = {
- .name = "S",
.ena = S3C64XX_NORMALCFG_DOMAIN_S_ON,
.pwr_stat = S3C64XX_BLKPWRSTAT_S,
.pd = {
+ .name = "S",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
};

static struct s3c64xx_pm_domain s3c64xx_pm_f = {
- .name = "F",
.ena = S3C64XX_NORMALCFG_DOMAIN_F_ON,
.pwr_stat = S3C64XX_BLKPWRSTAT_F,
.pd = {
+ .name = "F",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
};

static struct s3c64xx_pm_domain s3c64xx_pm_p = {
- .name = "P",
.ena = S3C64XX_NORMALCFG_DOMAIN_P_ON,
.pwr_stat = S3C64XX_BLKPWRSTAT_P,
.pd = {
+ .name = "P",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
};

static struct s3c64xx_pm_domain s3c64xx_pm_i = {
- .name = "I",
.ena = S3C64XX_NORMALCFG_DOMAIN_I_ON,
.pwr_stat = S3C64XX_BLKPWRSTAT_I,
.pd = {
+ .name = "I",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
};

static struct s3c64xx_pm_domain s3c64xx_pm_g = {
- .name = "G",
.ena = S3C64XX_NORMALCFG_DOMAIN_G_ON,
.pd = {
+ .name = "G",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
};

static struct s3c64xx_pm_domain s3c64xx_pm_v = {
- .name = "V",
.ena = S3C64XX_NORMALCFG_DOMAIN_V_ON,
.pwr_stat = S3C64XX_BLKPWRSTAT_V,
.pd = {
+ .name = "V",
.power_off = s3c64xx_pd_off,
.power_on = s3c64xx_pd_on,
},
--
1.9.0


\
 
 \ /
  Last update: 2014-03-03 18:01    [W:3.507 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site