diff options
| -rw-r--r-- | drivers/input/touchscreen/st/fts_gui.c | 8 | ||||
| -rw-r--r-- | drivers/input/touchscreen/st/fts_lib/ftsError.h | 1 | ||||
| -rw-r--r-- | drivers/input/touchscreen/st/fts_lib/ftsGesture.c | 11 | ||||
| -rw-r--r-- | drivers/input/touchscreen/st/fts_lib/ftsSoftware.h | 4 |
4 files changed, 13 insertions, 11 deletions
diff --git a/drivers/input/touchscreen/st/fts_gui.c b/drivers/input/touchscreen/st/fts_gui.c index f695137ada09..800237c6bff7 100644 --- a/drivers/input/touchscreen/st/fts_gui.c +++ b/drivers/input/touchscreen/st/fts_gui.c @@ -58,7 +58,7 @@ ssize_t fts_i2c_wr_show(struct device *dev, struct device_attribute *attr, snprintf(buff, sizeof(buff), "{"); strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff)); for (i = 0; i < (byte_count_read+2); i++) { - if ((i == 0)) { + if (i == 0) { char temp_byte_count_read = (byte_count_read >> 8) & 0xFF; snprintf(buff, sizeof(buff), "%02X", temp_byte_count_read); } else if (i == 1) { @@ -125,7 +125,7 @@ ssize_t fts_i2c_wr_store(struct device *dev, struct device_attribute *attr, #ifdef SCRIPTLESS_DEBUG printk("%s:DATA READ\n{", __func__); for (i = 0; i < (2+byte_count_read); i++) { - if ((i == 0)) { + if (i == 0) { char temp_byte_count_read = (byte_count_read >> 8) & 0xFF; printk("%02X", (unsigned int)temp_byte_count_read); } else if (i == 1) { @@ -173,7 +173,7 @@ ssize_t fts_i2c_read_show(struct device *dev, struct device_attribute *attr, snprintf(buff, sizeof(buff), "{"); strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff)); for (i = 0; i < (byte_count_read+2); i++) { - if ((i == 0)) { + if (i == 0) { char temp_byte_count_read = (byte_count_read >> 8) & 0xFF; snprintf(buff, sizeof(buff), "%02X", temp_byte_count_read); } else if (i == 1) { @@ -241,7 +241,7 @@ ssize_t fts_i2c_read_store(struct device *dev, struct device_attribute *attr, #ifdef SCRIPTLESS_DEBUG printk("%s:DATA READ\n{", __func__); for (i = 0; i < (byte_count_read+2); i++) { - if ((i == 0)) { + if (i == 0) { char temp_byte_count_read = (byte_count_read >> 8) & 0xFF; printk("%02X", (unsigned int)temp_byte_count_read); } else if (i == 1) { diff --git a/drivers/input/touchscreen/st/fts_lib/ftsError.h b/drivers/input/touchscreen/st/fts_lib/ftsError.h index fc8fa5003158..05b8ba9e4612 100644 --- a/drivers/input/touchscreen/st/fts_lib/ftsError.h +++ b/drivers/input/touchscreen/st/fts_lib/ftsError.h @@ -11,6 +11,7 @@ ************************************************************************** */ +#include <linux/types.h> /*FIRST LEVEL ERROR CODE*/ #define OK ((int)0x00000000) /*No ERROR*/ diff --git a/drivers/input/touchscreen/st/fts_lib/ftsGesture.c b/drivers/input/touchscreen/st/fts_lib/ftsGesture.c index ee97a417d4cb..89f84efc08e2 100644 --- a/drivers/input/touchscreen/st/fts_lib/ftsGesture.c +++ b/drivers/input/touchscreen/st/fts_lib/ftsGesture.c @@ -334,7 +334,9 @@ int addCustomGesture(u8 *data, int size, u8 gestureID) index = gestureID - GESTURE_CUSTOM_OFFSET; logError(0, "%s Starting Custom Gesture Adding procedure...\n", tag); - if (size != GESTURE_CUSTOM_POINTS && gestureID != GES_ID_CUST1 && gestureID != GES_ID_CUST2 && gestureID != GES_ID_CUST3 && gestureID != GES_ID_CUST4 && gestureID && GES_ID_CUST5) { + if ((size != GESTURE_CUSTOM_POINTS) && (gestureID != GES_ID_CUST1) + && (gestureID != GES_ID_CUST2) && (gestureID != GES_ID_CUST3) + && (gestureID != GES_ID_CUST4) && (gestureID != GES_ID_CUST5)) { logError(1, "%s addCustomGesture: Invalid size (%d) or Custom GestureID (%02X)! ERROR %08X\n", tag, size, gestureID, ERROR_OP_NOT_ALLOW); return ERROR_OP_NOT_ALLOW; } @@ -364,7 +366,9 @@ int removeCustomGesture(u8 gestureID) index = gestureID - GESTURE_CUSTOM_OFFSET; logError(0, "%s Starting Custom Gesture Removing procedure...\n", tag); - if (gestureID != GES_ID_CUST1 && gestureID != GES_ID_CUST2 && gestureID != GES_ID_CUST3 && gestureID != GES_ID_CUST4 && gestureID && GES_ID_CUST5) { + if ((gestureID != GES_ID_CUST1) && (gestureID != GES_ID_CUST2) + && (gestureID != GES_ID_CUST3) && (gestureID != GES_ID_CUST4) + && (gestureID != GES_ID_CUST5)) { logError(1, "%s removeCustomGesture: Invalid size (%d) or Custom GestureID (%02X)! ERROR %08X\n", tag, gestureID, ERROR_OP_NOT_ALLOW); return ERROR_OP_NOT_ALLOW; } @@ -381,7 +385,8 @@ int removeCustomGesture(u8 gestureID) return res; } - if (readData[2] != gestureID || readData[4] != 0x00) { /* check of gestureID is redundant */ + /* check of gestureID is redundant */ + if ((readData[2] != gestureID) || (readData[4] != 0x00)) { logError(1, "%s removeCustomGesture: remove event status not OK! ERROR %08X\n", tag, readData[4]); return ERROR_GESTURE_REMOVE; } diff --git a/drivers/input/touchscreen/st/fts_lib/ftsSoftware.h b/drivers/input/touchscreen/st/fts_lib/ftsSoftware.h index c8bbc8e18d28..080661d134d0 100644 --- a/drivers/input/touchscreen/st/fts_lib/ftsSoftware.h +++ b/drivers/input/touchscreen/st/fts_lib/ftsSoftware.h @@ -15,10 +15,6 @@ #include "ftsHardware.h" -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; - #define ECHO_ENABLED 0x00000001 /* chipInfo ftsInfo; */ |