| Message ID | 4D95DB70.2090604@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, 2011/4/1 Iiro Valkonen <iiro.valkonen@atmel.com>: > This is version 2 of the patch, where sysfs group is correctly removed in case of error, and the firmware update is also considered (mxt_make_highchg is also called from mxt_initialize). > > Original description: > > Make the CHG line (interrupt line) go high after the interrupts have been enabled to make sure we don't miss the falling edge. > > Signed-off-by: Iiro Valkonen <iiro.valkonen@atmel.com> > --- > drivers/input/touchscreen/atmel_mxt_ts.c | 14 ++++++++++---- > 1 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c > index 4012436..08ea846 100644 > --- a/drivers/input/touchscreen/atmel_mxt_ts.c > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c > @@ -804,10 +804,6 @@ static int mxt_initialize(struct mxt_data *data) > if (error) > return error; > > - error = mxt_make_highchg(data); > - if (error) > - return error; > - > mxt_handle_pdata(data); > > /* Backup to memory */ > @@ -832,6 +828,10 @@ static int mxt_initialize(struct mxt_data *data) > return error; > info->matrix_ysize = val; > > + error = mxt_make_highchg(data); > + if (error) > + return error; > + This is unnecessary patch. If you add this for firmware update part, how about move to mxt_update_fw_store()? > dev_info(&client->dev, > "Family ID: %d Variant ID: %d Version: %d Build: %d\n", > info->family_id, info->variant_id, info->version, > @@ -1098,8 +1098,14 @@ static int __devinit mxt_probe(struct i2c_client *client, > if (error) > goto err_unregister_device; > > + error = mxt_make_highchg(data); > + if (error) > + goto err_remove_sysfs_group; > + This is ok, but how about move this to the below request_threaded_irq() instead of adding error handling? > return 0; > > +err_remove_sysfs_group: > + sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); > err_unregister_device: > input_unregister_device(input_dev); > input_dev = NULL; > -- > 1.7.0.4 > Thanks.
Hello, On 04/08/2011 07:56 AM, Joonyoung Shim wrote: > Hi, > > 2011/4/1 Iiro Valkonen <iiro.valkonen@atmel.com>: >> This is version 2 of the patch, where sysfs group is correctly removed in case of error, and the firmware update is also considered (mxt_make_highchg is also called from mxt_initialize). >> >> Original description: >> >> Make the CHG line (interrupt line) go high after the interrupts have been enabled to make sure we don't miss the falling edge. >> >> Signed-off-by: Iiro Valkonen <iiro.valkonen@atmel.com> >> --- >> drivers/input/touchscreen/atmel_mxt_ts.c | 14 ++++++++++---- >> 1 files changed, 10 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c >> index 4012436..08ea846 100644 >> --- a/drivers/input/touchscreen/atmel_mxt_ts.c >> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c >> @@ -804,10 +804,6 @@ static int mxt_initialize(struct mxt_data *data) >> if (error) >> return error; >> >> - error = mxt_make_highchg(data); >> - if (error) >> - return error; >> - >> mxt_handle_pdata(data); >> >> /* Backup to memory */ >> @@ -832,6 +828,10 @@ static int mxt_initialize(struct mxt_data *data) >> return error; >> info->matrix_ysize = val; >> >> + error = mxt_make_highchg(data); >> + if (error) >> + return error; >> + > > This is unnecessary patch. If you add this for firmware update part, > how about move to mxt_update_fw_store()? > Good call. >> dev_info(&client->dev, >> "Family ID: %d Variant ID: %d Version: %d Build: %d\n", >> info->family_id, info->variant_id, info->version, >> @@ -1098,8 +1098,14 @@ static int __devinit mxt_probe(struct i2c_client *client, >> if (error) >> goto err_unregister_device; >> >> + error = mxt_make_highchg(data); >> + if (error) >> + goto err_remove_sysfs_group; >> + > > This is ok, but how about move this to the below request_threaded_irq() > instead of adding error handling? > Makes sense, will move it. Thanks for the feedback. BR,
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 4012436..08ea846 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -804,10 +804,6 @@ static int mxt_initialize(struct mxt_data *data) if (error) return error; - error = mxt_make_highchg(data); - if (error) - return error; - mxt_handle_pdata(data); /* Backup to memory */ @@ -832,6 +828,10 @@ static int mxt_initialize(struct mxt_data *data) return error; info->matrix_ysize = val; + error = mxt_make_highchg(data); + if (error) + return error; + dev_info(&client->dev, "Family ID: %d Variant ID: %d Version: %d Build: %d\n", info->family_id, info->variant_id, info->version, @@ -1098,8 +1098,14 @@ static int __devinit mxt_probe(struct i2c_client *client, if (error) goto err_unregister_device; + error = mxt_make_highchg(data); + if (error) + goto err_remove_sysfs_group; + return 0; +err_remove_sysfs_group: + sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); err_unregister_device: input_unregister_device(input_dev); input_dev = NULL;