mfd: twl-core: Change TWL4030_MODULE_* ids to TWL_MODULE_*
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 13 Nov 2012 08:28:54 +0000 (09:28 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 21 Nov 2012 15:08:06 +0000 (16:08 +0100)
To facilitate upcoming cleanup in twl stack.
No functional changes.

Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/twl-core.c

index f857097aca5cda63a626faa1b72fa070feed2a0b..43c7b4c92940f01fb8032b7aba0aec33bb5e76aa 100644 (file)
@@ -1077,8 +1077,8 @@ static inline int __init protect_pm_master(void)
 {
        int e = 0;
 
-       e = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0,
-                       TWL4030_PM_MASTER_PROTECT_KEY);
+       e = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, 0,
+                            TWL4030_PM_MASTER_PROTECT_KEY);
        return e;
 }
 
@@ -1086,12 +1086,10 @@ static inline int __init unprotect_pm_master(void)
 {
        int e = 0;
 
-       e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
-                       TWL4030_PM_MASTER_KEY_CFG1,
-                       TWL4030_PM_MASTER_PROTECT_KEY);
-       e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
-                       TWL4030_PM_MASTER_KEY_CFG2,
-                       TWL4030_PM_MASTER_PROTECT_KEY);
+       e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, TWL4030_PM_MASTER_KEY_CFG1,
+                             TWL4030_PM_MASTER_PROTECT_KEY);
+       e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, TWL4030_PM_MASTER_KEY_CFG2,
+                             TWL4030_PM_MASTER_PROTECT_KEY);
 
        return e;
 }