diff --git a/drivers/iio/adc/qcom-rradc.c b/drivers/iio/adc/qcom-rradc.c
index ae2df4f7ff0d..a0fcad198f62 100644
--- a/drivers/iio/adc/qcom-rradc.c
+++ b/drivers/iio/adc/qcom-rradc.c
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) "RRADC: %s: " fmt, __func__
+
 #include <linux/iio/iio.h>
 #include <linux/kernel.h>
 #include <linux/math64.h>
diff --git a/drivers/power/qcom-charger/qpnp-smb2.c b/drivers/power/qcom-charger/qpnp-smb2.c
index a7dd0bfc66ad..7caa9548308a 100644
--- a/drivers/power/qcom-charger/qpnp-smb2.c
+++ b/drivers/power/qcom-charger/qpnp-smb2.c
@@ -392,7 +392,11 @@ static int smb2_usb_get_prop(struct power_supply *psy,
 		rc = -EINVAL;
 		break;
 	}
-	return rc;
+	if (rc < 0) {
+		pr_debug("Couldn't get prop %d rc = %d\n", psp, rc);
+		return -ENODATA;
+	}
+	return 0;
 }
 
 static int smb2_usb_set_prop(struct power_supply *psy,
@@ -506,8 +510,11 @@ static int smb2_dc_get_prop(struct power_supply *psy,
 	default:
 		return -EINVAL;
 	}
-
-	return rc;
+	if (rc < 0) {
+		pr_debug("Couldn't get prop %d rc = %d\n", psp, rc);
+		return -ENODATA;
+	}
+	return 0;
 }
 
 static int smb2_dc_set_prop(struct power_supply *psy,
@@ -633,8 +640,11 @@ static int smb2_batt_get_prop(struct power_supply *psy,
 		pr_err("batt power supply prop %d not supported\n", psp);
 		return -EINVAL;
 	}
-
-	return rc;
+	if (rc < 0) {
+		pr_debug("Couldn't get prop %d rc = %d\n", psp, rc);
+		return -ENODATA;
+	}
+	return 0;
 }
 
 static int smb2_batt_set_prop(struct power_supply *psy,
diff --git a/drivers/power/qcom-charger/smb138x-charger.c b/drivers/power/qcom-charger/smb138x-charger.c
index a77b0bbc193c..5b4e7bcccdce 100644
--- a/drivers/power/qcom-charger/smb138x-charger.c
+++ b/drivers/power/qcom-charger/smb138x-charger.c
@@ -184,8 +184,11 @@ static int smb138x_usb_get_prop(struct power_supply *psy,
 		pr_err("get prop %d is not supported\n", prop);
 		return -EINVAL;
 	}
-
-	return rc;
+	if (rc < 0) {
+		pr_debug("Couldn't get prop %d rc = %d\n", prop, rc);
+		return -ENODATA;
+	}
+	return 0;
 }
 
 static int smb138x_usb_set_prop(struct power_supply *psy,
@@ -305,12 +308,14 @@ static int smb138x_batt_get_prop(struct power_supply *psy,
 		rc = smblib_get_prop_charger_temp_max(chg, val);
 		break;
 	default:
-		pr_err("batt power supply get prop %d not supported\n",
-			prop);
+		pr_err("batt power supply get prop %d not supported\n", prop);
 		return -EINVAL;
 	}
-
-	return rc;
+	if (rc < 0) {
+		pr_debug("Couldn't get prop %d rc = %d\n", prop, rc);
+		return -ENODATA;
+	}
+	return 0;
 }
 
 static int smb138x_batt_set_prop(struct power_supply *psy,
@@ -436,8 +441,11 @@ static int smb138x_parallel_get_prop(struct power_supply *psy,
 			prop);
 		return -EINVAL;
 	}
-
-	return rc;
+	if (rc < 0) {
+		pr_debug("Couldn't get prop %d rc = %d\n", prop, rc);
+		return -ENODATA;
+	}
+	return 0;
 }
 
 static int smb138x_parallel_set_prop(struct power_supply *psy,