From d5ee5344f10b689e536a1bccef6fe80b73d69df7 Mon Sep 17 00:00:00 2001
From: Matt Sealey <matt@genesi-usa.com>
Date: Thu, 17 Feb 2011 17:06:01 -0600
Subject: [PATCH] lcd platform data member name change

---
 arch/arm/plat-mxc/include/mach/mxc.h |  4 ++--
 drivers/video/mxc/mxcfb_mtl017.c     | 32 ++++++++++++----------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 4409fecd2c8..b0506df4450 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -336,8 +336,8 @@ struct mxc_lcd_platform_data {
 	char *analog_reg;
 
 	/* Efika MX Additions */
-        void (*power_on_lcd) (int);
-        void (*power_on_lvds) (int);
+        void (*lcd_power) (int);
+        void (*lvds_power) (int);
         void (*lvds_enable) (int);
 	void (*reset) (void);
 
diff --git a/drivers/video/mxc/mxcfb_mtl017.c b/drivers/video/mxc/mxcfb_mtl017.c
index 4c1bfa210ca..4a592091e89 100644
--- a/drivers/video/mxc/mxcfb_mtl017.c
+++ b/drivers/video/mxc/mxcfb_mtl017.c
@@ -57,8 +57,8 @@ typedef struct mtl017_dev_data_tag {
         struct semaphore sem;
 
 	void (*reset)(void);
-	void (*power_on_lcd) (int);
-        void (*power_on_lvds) (int);
+	void (*lcd_power) (int);
+        void (*lvds_power) (int);
         void (*lvds_enable) (int);
 } mtl017_dev_data;
 
@@ -685,14 +685,10 @@ static int __devinit mtl017_probe(struct i2c_client *client, const struct i2c_de
 	mtl017->suspending = 0;
 	mtl017->client = client;
 	if(plat) {
-		mtl017->reset =
-				plat->reset;
-		mtl017->power_on_lcd =
-				plat->power_on_lcd;
-                mtl017->power_on_lvds =
-				plat->power_on_lvds;
-                mtl017->lvds_enable =
-				plat->lvds_enable;
+		mtl017->reset = plat->reset;
+		mtl017->lcd_power = plat->lcd_power;
+                mtl017->lvds_power = plat->lvds_power;
+                mtl017->lvds_enable = plat->lvds_enable;
 	}
 
 /*         mtl017->lock = SPIN_LOCK_UNLOCKED; */
@@ -778,8 +774,8 @@ static void disp_power_on(void)
         if (down_interruptible(&mtl017->sem))
 		return;
 
-	if(mtl017->power_on_lcd) {
-		mtl017->power_on_lcd(1);
+	if(mtl017->lcd_power) {
+		mtl017->lcd_power(1);
 		msleep(10);
 	}
 
@@ -788,8 +784,8 @@ static void disp_power_on(void)
 		msleep(5);
 	}
 
-	if(mtl017->power_on_lvds) {
-		mtl017->power_on_lvds(1);
+	if(mtl017->lvds_power) {
+		mtl017->lvds_power(1);
 		msleep(5);
 	}
 
@@ -815,13 +811,13 @@ static void disp_power_off(void)
 		mtl017->lvds_enable(0);
 	}
 
-	if(mtl017->power_on_lvds) {
-		mtl017->power_on_lvds(0);
+	if(mtl017->lvds_power) {
+		mtl017->lvds_power(0);
 		msleep(5);
 	}
 
-        if(mtl017->power_on_lcd) {
-		mtl017->power_on_lcd(0);
+        if(mtl017->lcd_power) {
+		mtl017->lcd_power(0);
 	}
 
 	mtl017->disp_on = 0;