summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-08-29 16:44:50 -0600
committerTom Rini <[email protected]>2025-08-31 09:32:17 -0600
commit230e8dbc39ecdb50e441a0c795c8deebec18b4f1 (patch)
tree6d6413a0c4c683dd7f7e1ab56bd1bda7cf8d46f4
parent384079802a3eec3fff9578903285acc93ceda76f (diff)
parentaa136393c8fd448e903e3fd3297efb13e54c42d7 (diff)
Merge patch series "power: Address two Smatch reported issues"
Andrew Goodbody <[email protected]> says: Smatch reported issues with two power drivers due to redundant code and an unitialised variable. Link: https://lore.kernel.org/r/[email protected]
-rw-r--r--drivers/power/axp818.c2
-rw-r--r--drivers/power/power_i2c.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index 83ae6ecc138..01f9a209dc6 100644
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -248,8 +248,6 @@ int axp_init(void)
if (!(axp_chip_id == 0x51))
return -ENODEV;
- else
- return ret;
return 0;
}
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index c2fc1c6b42f..58289ecce67 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -75,7 +75,7 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
{
unsigned char buf[4] = { 0 };
u32 ret_val = 0;
- int ret;
+ int __maybe_unused ret;
if (check_reg(p, reg))
return -EINVAL;
@@ -91,9 +91,9 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
return -ENXIO;
}
ret = dm_i2c_read(dev, reg, buf, pmic_i2c_tx_num);
-#endif
if (ret)
return ret;
+#endif
switch (pmic_i2c_tx_num) {
case 3: