mfd: twl-core: Change TWL4030_MODULE_* ids to TWL_MODULE_*

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>

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index f857097..43c7b4c 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -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;
 }