Re: [PATCH v2 02/11] power: bq25890: simplify chip name property getter

[Sebastian Reichel]

Hi,

On Sun, May 03, 2020 at 05:21:10PM +0200, MichaÅ MirosÅaw wrote:
> Driver rejects unknown chips early in the probe(), so when
> bq25890_power_supply_get_property() is made reachable, bq->chip_version
> will already be set to correct value - there is no need to check
> it again.
> 
> Signed-off-by: MichaÅ MirosÅaw <mirq-linux@xxxxxxxxxxxx>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/bq25890_charger.c | 19 ++++++++-----------
>  1 file changed, 8 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c
> index c642519ef7b2..f9f29edadddc 100644
> --- a/drivers/power/supply/bq25890_charger.c
> +++ b/drivers/power/supply/bq25890_charger.c
> @@ -32,6 +32,13 @@ enum bq25890_chip_version {
>  	BQ25896,
>  };
>  
> +static const char *const bq25890_chip_name[] = {
> +	"BQ25890",
> +	"BQ25892",
> +	"BQ25895",
> +	"BQ25896",
> +};
> +
>  enum bq25890_fields {
>  	F_EN_HIZ, F_EN_ILIM, F_IILIM,				     /* Reg00 */
>  	F_BHOT, F_BCOLD, F_VINDPM_OFS,				     /* Reg01 */
> @@ -400,17 +407,7 @@ static int bq25890_power_supply_get_property(struct power_supply *psy,
>  		break;
>  
>  	case POWER_SUPPLY_PROP_MODEL_NAME:
> -		if (bq->chip_version == BQ25890)
> -			val->strval = "BQ25890";
> -		else if (bq->chip_version == BQ25892)
> -			val->strval = "BQ25892";
> -		else if (bq->chip_version == BQ25895)
> -			val->strval = "BQ25895";
> -		else if (bq->chip_version == BQ25896)
> -			val->strval = "BQ25896";
> -		else
> -			val->strval = "UNKNOWN";
> -
> +		val->strval = bq25890_chip_name[bq->chip_version];
>  		break;
>  
>  	case POWER_SUPPLY_PROP_ONLINE:
> -- 
> 2.20.1
>

Attachment: signature.asc
Description: PGP signature