DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input: atmel_maxtouch: Rename mxt_platform_data to maxtouch_platform_data

Browse Source 
Opensource driver atmel_mxt_ts has the platform data
structure name as atmel_maxtouch. Avoid name conflict
by renaming atmel_maxtouch driver's platform data to
maxtouch_platform_data.

Change-Id: I4bf3ed83e3eab55c4464de365c6009965da73744
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
This commit is contained in:
Mohan Pallaka
2011-11-23 16:34:21 +05:30
committed by Linux Build Service Account
parent 4b0f0d9b57
commit 4e9a94e60d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-msm/board-msm7x27a.c
View File

@@ -3041,7 +3041,7 @@ static u8 atmel_ts_valid_interrupt(void)
#define ATMEL_X_OFFSET 13 #define ATMEL_X_OFFSET 13
#define ATMEL_Y_OFFSET 0 #define ATMEL_Y_OFFSET 0
static struct mxt_platform_data atmel_ts_pdata = { static struct maxtouch_platform_data atmel_ts_pdata = {
.numtouch = 4, .numtouch = 4,
.init_platform_hw = atmel_ts_platform_init, .init_platform_hw = atmel_ts_platform_init,
.exit_platform_hw = atmel_ts_platform_exit, .exit_platform_hw = atmel_ts_platform_exit,

2
drivers/input/touchscreen/atmel_maxtouch.c
View File

@@ -1878,7 +1878,7 @@ static int __devinit mxt_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct mxt_data *mxt; struct mxt_data *mxt;
struct mxt_platform_data *pdata; struct maxtouch_platform_data *pdata;
struct input_dev *input; struct input_dev *input;
u8 *id_data; u8 *id_data;
u8 *t38_data; u8 *t38_data;

4
include/linux/atmel_maxtouch.h
View File

@@ -283,7 +283,7 @@ static int mxt_write_block_bl(struct i2c_client *client, u16 length, u8 *value);
#endif #endif
/** /**
* struct mxt_platform_data - includes platform specific informatio * struct maxtouch_platform_data - includes platform specific informatio
* related to Atmel maXTouch touchscreen controller. * related to Atmel maXTouch touchscreen controller.
* *
* @numtouch: Number of simultaneous touches supported * @numtouch: Number of simultaneous touches supported
@@ -298,7 +298,7 @@ static int mxt_write_block_bl(struct i2c_client *client, u16 length, u8 *value);
* @max_y: Reported Y range * @max_y: Reported Y range
*/ */
struct mxt_platform_data { struct maxtouch_platform_data {
u8 numtouch; /* Number of touches to report */ u8 numtouch; /* Number of touches to report */
int (*init_platform_hw)(struct i2c_client *client); int (*init_platform_hw)(struct i2c_client *client);
int (*exit_platform_hw)(struct i2c_client *client); int (*exit_platform_hw)(struct i2c_client *client);