* [PATCH] Input: elan_i2c - Fix typos for validpage_count
@ 2015-08-26 18:19 Benson Leung
2015-08-29 0:30 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Benson Leung @ 2015-08-26 18:19 UTC (permalink / raw)
To: dmitry.torokhov, dusonlin, michele.curti
Cc: bleung, linux-input, linux-kernel
Search for "vaildpage_count" and replace with "validpage_count".
Signed-off-by: Benson Leung <bleung@chromium.org>
---
drivers/input/mouse/elan_i2c_core.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index bbdaedc..d4a38ca 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 {
int pressure_adjustment;
u8 mode;
u8 ic_type;
- u16 fw_vaildpage_count;
+ u16 fw_validpage_count;
u16 fw_signature_address;
bool irq_wake;
@@ -94,28 +94,28 @@ struct elan_tp_data {
bool baseline_ready;
};
-static int elan_get_fwinfo(u8 ic_type, u16 *vaildpage_count,
+static int elan_get_fwinfo(u8 ic_type, u16 *validpage_count,
u16 *signature_address)
{
switch(ic_type) {
case 0x08:
- *vaildpage_count = 512;
+ *validpage_count = 512;
break;
case 0x09:
- *vaildpage_count = 768;
+ *validpage_count = 768;
break;
case 0x0D:
- *vaildpage_count = 896;
+ *validpage_count = 896;
break;
default:
/* unknown ic type clear value */
- *vaildpage_count = 0;
+ *validpage_count = 0;
*signature_address = 0;
return -ENXIO;
}
*signature_address =
- (*vaildpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE;
+ (*validpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE;
return 0;
}
@@ -264,7 +264,7 @@ static int elan_query_device_info(struct elan_tp_data *data)
if (error)
return error;
- error = elan_get_fwinfo(data->ic_type, &data->fw_vaildpage_count,
+ error = elan_get_fwinfo(data->ic_type, &data->fw_validpage_count,
&data->fw_signature_address);
if (error) {
dev_err(&data->client->dev,
@@ -356,7 +356,7 @@ static int __elan_update_firmware(struct elan_tp_data *data,
iap_start_addr = get_unaligned_le16(&fw->data[ETP_IAP_START_ADDR * 2]);
boot_page_count = (iap_start_addr * 2) / ETP_FW_PAGE_SIZE;
- for (i = boot_page_count; i < data->fw_vaildpage_count; i++) {
+ for (i = boot_page_count; i < data->fw_validpage_count; i++) {
u16 checksum = 0;
const u8 *page = &fw->data[i * ETP_FW_PAGE_SIZE];
--
2.5.0.457.gab17608
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Input: elan_i2c - Fix typos for validpage_count
2015-08-26 18:19 [PATCH] Input: elan_i2c - Fix typos for validpage_count Benson Leung
@ 2015-08-29 0:30 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2015-08-29 0:30 UTC (permalink / raw)
To: Benson Leung; +Cc: dusonlin, michele.curti, linux-input, linux-kernel
On Wed, Aug 26, 2015 at 11:19:31AM -0700, Benson Leung wrote:
> Search for "vaildpage_count" and replace with "validpage_count".
>
> Signed-off-by: Benson Leung <bleung@chromium.org>
Applied, thank you.
> ---
> drivers/input/mouse/elan_i2c_core.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
> index bbdaedc..d4a38ca 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 {
> int pressure_adjustment;
> u8 mode;
> u8 ic_type;
> - u16 fw_vaildpage_count;
> + u16 fw_validpage_count;
> u16 fw_signature_address;
>
> bool irq_wake;
> @@ -94,28 +94,28 @@ struct elan_tp_data {
> bool baseline_ready;
> };
>
> -static int elan_get_fwinfo(u8 ic_type, u16 *vaildpage_count,
> +static int elan_get_fwinfo(u8 ic_type, u16 *validpage_count,
> u16 *signature_address)
> {
> switch(ic_type) {
> case 0x08:
> - *vaildpage_count = 512;
> + *validpage_count = 512;
> break;
> case 0x09:
> - *vaildpage_count = 768;
> + *validpage_count = 768;
> break;
> case 0x0D:
> - *vaildpage_count = 896;
> + *validpage_count = 896;
> break;
> default:
> /* unknown ic type clear value */
> - *vaildpage_count = 0;
> + *validpage_count = 0;
> *signature_address = 0;
> return -ENXIO;
> }
>
> *signature_address =
> - (*vaildpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE;
> + (*validpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE;
>
> return 0;
> }
> @@ -264,7 +264,7 @@ static int elan_query_device_info(struct elan_tp_data *data)
> if (error)
> return error;
>
> - error = elan_get_fwinfo(data->ic_type, &data->fw_vaildpage_count,
> + error = elan_get_fwinfo(data->ic_type, &data->fw_validpage_count,
> &data->fw_signature_address);
> if (error) {
> dev_err(&data->client->dev,
> @@ -356,7 +356,7 @@ static int __elan_update_firmware(struct elan_tp_data *data,
> iap_start_addr = get_unaligned_le16(&fw->data[ETP_IAP_START_ADDR * 2]);
>
> boot_page_count = (iap_start_addr * 2) / ETP_FW_PAGE_SIZE;
> - for (i = boot_page_count; i < data->fw_vaildpage_count; i++) {
> + for (i = boot_page_count; i < data->fw_validpage_count; i++) {
> u16 checksum = 0;
> const u8 *page = &fw->data[i * ETP_FW_PAGE_SIZE];
>
> --
> 2.5.0.457.gab17608
>
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-29 0:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-26 18:19 [PATCH] Input: elan_i2c - Fix typos for validpage_count Benson Leung
2015-08-29 0:30 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).