Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23fa43a2 authored by Laurentiu Palcu's avatar Laurentiu Palcu Committed by Sebastian Reichel
Browse files

power_supply: bq25890: make chip_id int 



Smatch static checker correctly detected an impossible condition because
chip_id was declared as u8, instead of int:

drivers/power/bq25890_charger.c:843 bq25890_probe()
warn: impossible condition '(bq->chip_id < 0) => (0-255 < 0)'

Also, while at it, fix the return value too.

Signed-off-by: default avatarLaurentiu Palcu <laurentiu.palcu@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent e86d69dd

drivers/power/bq25890_charger.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ struct bq25890_device { 
	struct regmap *rmap;

	struct regmap *rmap;

	struct regmap_field *rmap_fields[F_MAX_FIELDS];

	struct regmap_field *rmap_fields[F_MAX_FIELDS];





	u8 chip_id;

	int chip_id;

	struct bq25890_init_data init_data;

	struct bq25890_init_data init_data;

	struct bq25890_state state;

	struct bq25890_state state;
@@ -842,7 +842,7 @@ static int bq25890_probe(struct i2c_client *client, 
	bq->chip_id = bq25890_field_read(bq, F_PN);

	bq->chip_id = bq25890_field_read(bq, F_PN);

	if (bq->chip_id < 0) {

	if (bq->chip_id < 0) {

		dev_err(dev, "Cannot read chip ID.\n");

		dev_err(dev, "Cannot read chip ID.\n");

		return ret;

		return bq->chip_id;

	}

	}





	if (bq->chip_id != BQ25890_ID) {

	if (bq->chip_id != BQ25890_ID) {