gsensor:modify gsensor struct name

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
index 5c01f1131b2259b88b46745bf7efcb02d6c017cf..7b399fa403fe8f48838ddee2204cb8eef89273a5 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -601,7 +601,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .swap_xyz = 1,

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index 77922adef7c85e48620996aa079a0f54f5b5c185..5528ced18b1f1881946769509d0dfb65a5cd908e 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -1079,7 +1079,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .swap_xyz = 1,

diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index 24fa6d4d2979069925e7d6e964c9a6acd3474dde..3fc218f5fe51ae1e7ae6a5f8c36ab49c481922d6 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -527,7 +527,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .init_platform_hw= mma8452_init_platform_hw,

diff --git a/arch/arm/mach-rk29/board-rk29-k97.c b/arch/arm/mach-rk29/board-rk29-k97.c
index 82ec490c49c2aaa82b1d4acffe3ed54a493f11d0..8135e530cda462ffc9670347c7cb213d660a49b8 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-k97.c
+++ b/arch/arm/mach-rk29/board-rk29-k97.c
@@ -1019,7 +1019,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xyz= 1,
   .swap_xy=0,

diff --git a/arch/arm/mach-rk29/board-rk29-newton.c b/arch/arm/mach-rk29/board-rk29-newton.c
old mode 100644 (file)
new mode 100755 (executable)
index c1db192..0346c83
--- a/arch/arm/mach-rk29/board-rk29-newton.c
+++ b/arch/arm/mach-rk29/board-rk29-newton.c
@@ -797,7 +797,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .init_platform_hw= mma8452_init_platform_hw,

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index c8ed5a3c2443ed6dea629f8bd941dbfd369ce142..05a5b7bc1c832cfda51b83d330400fed176923d4 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -616,7 +616,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .init_platform_hw= mma8452_init_platform_hw,

diff --git a/arch/arm/mach-rk29/board-rk29-td8801_v2.c b/arch/arm/mach-rk29/board-rk29-td8801_v2.c
index 6aa30d8ec68958bc56c9d715153c4ff4b06750fd..d96a6590461cf20e94868eec57857219513f97ea 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-td8801_v2.c
+++ b/arch/arm/mach-rk29/board-rk29-td8801_v2.c
@@ -662,7 +662,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .init_platform_hw= mma8452_init_platform_hw,

diff --git a/arch/arm/mach-rk29/board-rk29-z5.c b/arch/arm/mach-rk29/board-rk29-z5.c
old mode 100644 (file)
new mode 100755 (executable)
index 3bb356b..6af7459
--- a/arch/arm/mach-rk29/board-rk29-z5.c
+++ b/arch/arm/mach-rk29/board-rk29-z5.c
@@ -683,7 +683,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .init_platform_hw= mma8452_init_platform_hw,

diff --git a/arch/arm/mach-rk29/board-rk29phonepadsdk.c b/arch/arm/mach-rk29/board-rk29phonepadsdk.c
index b6c7b3fdb11b5cfd8fa092de50df0e92a92d43bc..51390e75aba53496b2707bd14d3c4c9a09ca0e2e 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29phonepadsdk.c
+++ b/arch/arm/mach-rk29/board-rk29phonepadsdk.c
@@ -752,7 +752,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 0,
   .init_platform_hw= mma8452_init_platform_hw,

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
old mode 100644 (file)
new mode 100755 (executable)
index ae38fb6..cd5090f
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -862,7 +862,7 @@ static int mma8452_init_platform_hw(void)
 }
 
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
   .model= 8452,
   .swap_xy = 1,
   .init_platform_hw= mma8452_init_platform_hw,

diff --git a/arch/arm/mach-rk30/board-rk30-phone-loquat.c b/arch/arm/mach-rk30/board-rk30-phone-loquat.c
index 6dd35d7afc864b6ba3110bdb5a2cfecbd88f21a0..b764fd96eb1e21269bdb623622df4a909f44dfb9 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-phone-loquat.c
+++ b/arch/arm/mach-rk30/board-rk30-phone-loquat.c
@@ -809,16 +809,10 @@ static int mma8452_init_platform_hw(void)
 {
        rk30_mux_api_set(GPIO4C0_SMCDATA0_TRACEDATA0_NAME, GPIO4C_GPIO4C0);
 
-       if (gpio_request(MMA8452_INT_PIN, NULL) != 0) {
-               gpio_free(MMA8452_INT_PIN);
-               printk("mma8452_init_platform_hw gpio_request error\n");
-               return -EIO;
-       }
-       gpio_pull_updown(MMA8452_INT_PIN, 1);
        return 0;
 }
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
        .model = 8452,
        .swap_xy = 0,
        .swap_xyz = 1,

diff --git a/arch/arm/mach-rk30/board-rk30-phone.c b/arch/arm/mach-rk30/board-rk30-phone.c
index f22aff8b18affb8c26c6df4dfdaa7af0012645a8..516e388819c03950723e6761e367380e9764dedc 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-phone.c
+++ b/arch/arm/mach-rk30/board-rk30-phone.c
@@ -900,7 +900,7 @@ static int mma8452_init_platform_hw(void)
        return 0;
 }
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
        .model = 8452,
        .swap_xy = 0,
        .swap_xyz = 1,

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 560deae7ad098efc4561673f716499f0e7d29fbe..118921060dd1a132dda5bc6536a57fd7587accbd 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -693,7 +693,7 @@ static int mma8452_init_platform_hw(void)
        return 0;
 }
 
-static struct mma8452_platform_data mma8452_info = {
+static struct gsensor_platform_data mma8452_info = {
        .model = 8452,
        .swap_xy = 0,
        .swap_xyz = 1,

diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h
index 44a502521ad56a162fbf6e04f5418a1164447f03..98fee642d8040f7e47122908ed90095996cecb3c 100755 (executable)
--- a/arch/arm/plat-rk/include/plat/board.h
+++ b/arch/arm/plat-rk/include/plat/board.h
@@ -78,15 +78,15 @@ struct rk29_sdmmc_platform_data {
        int write_prt;
 };
 
-struct mma8452_platform_data {
+struct gsensor_platform_data {
        u16 model;
        u16 swap_xy;
        u16 swap_xyz;
        signed char orientation[9];
        int (*get_pendown_state)(void);
        int (*init_platform_hw)(void);
-       int (*mma8452_platform_sleep)(void);
-       int (*mma8452_platform_wakeup)(void);
+       int (*gsensor_platform_sleep)(void);
+       int (*gsensor_platform_wakeup)(void);
        void (*exit_platform_hw)(void);
 };
 

diff --git a/drivers/input/gsensor/mma8452.c b/drivers/input/gsensor/mma8452.c
index 37f469a4a5098566fa883af3d52d20a64b474a65..418f61b7e3bef56069c634c4968ef6d3af2a0f3e 100755 (executable)
--- a/drivers/input/gsensor/mma8452.c
+++ b/drivers/input/gsensor/mma8452.c
@@ -400,7 +400,7 @@ static int mma8452_get_data(struct i2c_client *client)
        int ret;
        int x,y,z;
     struct mma8452_axis axis;
-    struct mma8452_platform_data *pdata = pdata = client->dev.platform_data;
+    struct gsensor_platform_data *pdata = pdata = client->dev.platform_data;
 
 /* enabled only if FREAD MODE */
 /*
@@ -761,7 +761,7 @@ static int mma8452_init_client(struct i2c_client *client)
 static int  mma8452_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
        struct mma8452_data *mma8452;
-       struct mma8452_platform_data *pdata = pdata = client->dev.platform_data;
+       struct gsensor_platform_data *pdata = pdata = client->dev.platform_data;
        int err;
 
        mmaprintkf("%s enter\n",__FUNCTION__);

diff --git a/include/linux/mma8452.h b/include/linux/mma8452.h
index 6bc81c2a5b0ee11488b99e64524a910c42042fab..ef9e4f607a4c3919062d90674abcdbc6a1aa730f 100755 (executable)
--- a/include/linux/mma8452.h
+++ b/include/linux/mma8452.h
@@ -126,16 +126,6 @@
 
 #define MMA8452_REG_LEN         11
 
-
-/*
-struct mma8452_platform_data {
-       int reset;
-       int clk_on;
-       int intr;
-};
-
-*/
-
 struct mma8452_axis {
        int x;
        int y;