Re: [PATCH v2 1/2] power: supply: sbs-battery: don't assume MANUFACTURER_DATA formats

[Brian Norris <briannorris@chromium.org>]

Hi,

On Fri, Jun 01, 2018 at 10:34:34AM -0700, Guenter Roeck wrote:
> On Fri, Jun 01, 2018 at 10:23:59AM -0700, Brian Norris wrote:
> >  drivers/power/supply/sbs-battery.c | 54 +++++++++++++++++++++++++-----
> >  1 file changed, 46 insertions(+), 8 deletions(-)
> > 
> > diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
> > index 83d7b4115857..8dea63464a3f 100644
> > --- a/drivers/power/supply/sbs-battery.c
> > +++ b/drivers/power/supply/sbs-battery.c
...

> > @@ -315,6 +320,27 @@ static int sbs_status_correct(struct i2c_client *client, int *intval)
> >  static int sbs_get_battery_presence_and_health(
> >  	struct i2c_client *client, enum power_supply_property psp,
> >  	union power_supply_propval *val)
> > +{
> > +	int ret;
> > +
> > +	if (psp == POWER_SUPPLY_PROP_PRESENT) {
> > +		/* Dummy command; if it succeeds, battery is present. */
> > +		ret = sbs_read_word_data(client, sbs_data[REG_STATUS].addr);
> > +		if (ret < 0)
> > +			val->intval = 0; /* battery disconnected */
> > +		else
> > +			val->intval = 1; /* battery present */
> > +		return 0;
> > +	} else { /* POWER_SUPPLY_PROP_HEALTH */
> 
> Static analyzers may complain that else after return is unnecessary.

I noticed (checkpatch complains) but decided I didn't care. It would be
worse to promote the 'else' to top-level (things would look asymmetric).
I suppose I could pull the 'return 0' out, but I'm not sure that would
make the code any better.

> Other than that
> 
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> 
> > +		/* SBS spec doesn't have a general health command. */
> > +		val->intval = POWER_SUPPLY_HEALTH_UNKNOWN;
> > +		return 0;
> > +	}
> > +}
> > +

Brian