Re: [PATCH v3] Input: elants_i2c - get product id on recovery mode for FW update

["'Dmitry Torokhov'" <dmitry.torokhov@gmail.com>]

On Mon, Sep 26, 2016 at 10:30:56AM +0800, Johnny.Chuang wrote:
> There is only one different which is adding a new empty line for coding
> style.
> 
> >  	if (!error)
> > -		error = elants_i2c_query_fw_id(ts);
> > +		error = error2;
> > +
> >  	if (!error)
> >  		error = elants_i2c_query_fw_version(ts);

OK, since I already applied the other version I'll ignore this one as
the difference is not important.

Thanks.

> 
> -----Original Message-----
> From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] 
> Sent: Saturday, September 24, 2016 5:31 AM
> To: Johnny Chuang
> Cc: Daniel Kurtz; Jennifer Tsai; linux-kernel@vger.kernel.org;
> linux-input@vger.kernel.org; James Chen; Paul Liang; Jeff Chuang; Agnes
> Cheng
> Subject: Re: [PATCH v3] Input: elants_i2c - get product id on recovery mode
> for FW update
> 
> On Fri, Sep 23, 2016 at 04:01:17PM +0800, Johnny Chuang wrote:
> > This CL takes the responsibility for getting product/hardware id on 
> > recovery mode.
> > It will fix firmware update script could not find correspond firmware 
> > file name on recovery mode.
> > BTW, firmware must need to support reading product/hardware id on boot 
> > code.
> > 
> > Signed-off-by: Johnny Chuang <johnny.chuang@emc.com.tw>
> 
> This appears to be exactly the same as to what I already have in my "next"
> branch...
> 
> > ---
> >  drivers/input/touchscreen/elants_i2c.c | 31 
> > ++++++++++++++++++++-----------
> >  1 file changed, 20 insertions(+), 11 deletions(-)
> > 
> > diff --git a/drivers/input/touchscreen/elants_i2c.c 
> > b/drivers/input/touchscreen/elants_i2c.c
> > index ac09855..02aec28 100644
> > --- a/drivers/input/touchscreen/elants_i2c.c
> > +++ b/drivers/input/touchscreen/elants_i2c.c
> > @@ -298,7 +298,7 @@ static u16 elants_i2c_parse_version(u8 *buf)
> >  	return get_unaligned_be32(buf) >> 4;  }
> >  
> > -static int elants_i2c_query_fw_id(struct elants_data *ts)
> > +static int elants_i2c_query_hw_version(struct elants_data *ts)
> >  {
> >  	struct i2c_client *client = ts->client;
> >  	int error, retry_cnt;
> > @@ -318,8 +318,13 @@ static int elants_i2c_query_fw_id(struct elants_data
> *ts)
> >  			error, (int)sizeof(resp), resp);
> >  	}
> >  
> > -	dev_err(&client->dev,
> > -		"Failed to read fw id or fw id is invalid\n");
> > +	if (error) {
> > +		dev_err(&client->dev,
> > +			"Failed to read fw id: %d\n", error);
> > +		return error;
> > +	}
> > +
> > +	dev_err(&client->dev, "Invalid fw id: %#04x\n", ts->hw_version);
> >  
> >  	return -EINVAL;
> >  }
> > @@ -508,7 +513,7 @@ static int elants_i2c_fastboot(struct i2c_client 
> > *client)  static int elants_i2c_initialize(struct elants_data *ts)  {
> >  	struct i2c_client *client = ts->client;
> > -	int error, retry_cnt;
> > +	int error, error2, retry_cnt;
> >  	const u8 hello_packet[] = { 0x55, 0x55, 0x55, 0x55 };
> >  	const u8 recov_packet[] = { 0x55, 0x55, 0x80, 0x80 };
> >  	u8 buf[HEADER_SIZE];
> > @@ -553,18 +558,22 @@ static int elants_i2c_initialize(struct elants_data
> *ts)
> >  		}
> >  	}
> >  
> > +	/* hw version is available even if device in recovery state */
> > +	error2 = elants_i2c_query_hw_version(ts);
> >  	if (!error)
> > -		error = elants_i2c_query_fw_id(ts);
> > +		error = error2;
> > +
> >  	if (!error)
> >  		error = elants_i2c_query_fw_version(ts);
> > +	if (!error)
> > +		error = elants_i2c_query_test_version(ts);
> > +	if (!error)
> > +		error = elants_i2c_query_bc_version(ts);
> > +	if (!error)
> > +		error = elants_i2c_query_ts_info(ts);
> >  
> > -	if (error) {
> > +	if (error)
> >  		ts->iap_mode = ELAN_IAP_RECOVERY;
> > -	} else {
> > -		elants_i2c_query_test_version(ts);
> > -		elants_i2c_query_bc_version(ts);
> > -		elants_i2c_query_ts_info(ts);
> > -	}
> >  
> >  	return 0;
> >  }
> > --
> > 1.8.3.2
> > 
> 
> -- 
> Dmitry
> 

-- 
Dmitry