aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenson Leung <bleung@chromium.org>2015-08-28 20:30:16 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-08-28 20:46:24 -0400
commit742f452b9b60c228a33e8d35fd2c74cd15bdaa29 (patch)
tree3044da6fe8d4d26ed1584f78275b58b3be5a8f3e
parent66bc2f51ef7deabc8b8f3baa98ae64b65e5e973a (diff)
Input: elan_i2c - fix typos for validpage_count
Search for "vaildpage_count" and replace with "validpage_count". Signed-off-by: Benson Leung <bleung@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/mouse/elan_i2c_core.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index bbdaedc09261..d4a38caa1ab1 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -84,7 +84,7 @@ struct elan_tp_data {
84 int pressure_adjustment; 84 int pressure_adjustment;
85 u8 mode; 85 u8 mode;
86 u8 ic_type; 86 u8 ic_type;
87 u16 fw_vaildpage_count; 87 u16 fw_validpage_count;
88 u16 fw_signature_address; 88 u16 fw_signature_address;
89 89
90 bool irq_wake; 90 bool irq_wake;
@@ -94,28 +94,28 @@ struct elan_tp_data {
94 bool baseline_ready; 94 bool baseline_ready;
95}; 95};
96 96
97static int elan_get_fwinfo(u8 ic_type, u16 *vaildpage_count, 97static int elan_get_fwinfo(u8 ic_type, u16 *validpage_count,
98 u16 *signature_address) 98 u16 *signature_address)
99{ 99{
100 switch(ic_type) { 100 switch(ic_type) {
101 case 0x08: 101 case 0x08:
102 *vaildpage_count = 512; 102 *validpage_count = 512;
103 break; 103 break;
104 case 0x09: 104 case 0x09:
105 *vaildpage_count = 768; 105 *validpage_count = 768;
106 break; 106 break;
107 case 0x0D: 107 case 0x0D:
108 *vaildpage_count = 896; 108 *validpage_count = 896;
109 break; 109 break;
110 default: 110 default:
111 /* unknown ic type clear value */ 111 /* unknown ic type clear value */
112 *vaildpage_count = 0; 112 *validpage_count = 0;
113 *signature_address = 0; 113 *signature_address = 0;
114 return -ENXIO; 114 return -ENXIO;
115 } 115 }
116 116
117 *signature_address = 117 *signature_address =
118 (*vaildpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE; 118 (*validpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE;
119 119
120 return 0; 120 return 0;
121} 121}
@@ -264,7 +264,7 @@ static int elan_query_device_info(struct elan_tp_data *data)
264 if (error) 264 if (error)
265 return error; 265 return error;
266 266
267 error = elan_get_fwinfo(data->ic_type, &data->fw_vaildpage_count, 267 error = elan_get_fwinfo(data->ic_type, &data->fw_validpage_count,
268 &data->fw_signature_address); 268 &data->fw_signature_address);
269 if (error) { 269 if (error) {
270 dev_err(&data->client->dev, 270 dev_err(&data->client->dev,
@@ -356,7 +356,7 @@ static int __elan_update_firmware(struct elan_tp_data *data,
356 iap_start_addr = get_unaligned_le16(&fw->data[ETP_IAP_START_ADDR * 2]); 356 iap_start_addr = get_unaligned_le16(&fw->data[ETP_IAP_START_ADDR * 2]);
357 357
358 boot_page_count = (iap_start_addr * 2) / ETP_FW_PAGE_SIZE; 358 boot_page_count = (iap_start_addr * 2) / ETP_FW_PAGE_SIZE;
359 for (i = boot_page_count; i < data->fw_vaildpage_count; i++) { 359 for (i = boot_page_count; i < data->fw_validpage_count; i++) {
360 u16 checksum = 0; 360 u16 checksum = 0;
361 const u8 *page = &fw->data[i * ETP_FW_PAGE_SIZE]; 361 const u8 *page = &fw->data[i * ETP_FW_PAGE_SIZE];
362 362