diff --git a/drivers/power/supply/qcom/qpnp-smb5.c b/drivers/power/supply/qcom/qpnp-smb5.c
index 879e398a53cd..2f79beb2f680 100644
--- a/drivers/power/supply/qcom/qpnp-smb5.c
+++ b/drivers/power/supply/qcom/qpnp-smb5.c
@@ -2324,17 +2324,17 @@ static int smb5_determine_initial_status(struct smb5 *chip)
 	if (chg->iio_chan_list_qg)
 		smblib_suspend_on_debug_battery(chg);
 
-	usb_plugin_irq_handler(0, &irq_data);
-	dc_plugin_irq_handler(0, &irq_data);
-	typec_attach_detach_irq_handler(0, &irq_data);
-	typec_state_change_irq_handler(0, &irq_data);
-	usb_source_change_irq_handler(0, &irq_data);
-	chg_state_change_irq_handler(0, &irq_data);
-	icl_change_irq_handler(0, &irq_data);
-	batt_temp_changed_irq_handler(0, &irq_data);
-	wdog_bark_irq_handler(0, &irq_data);
-	typec_or_rid_detection_change_irq_handler(0, &irq_data);
-	wdog_snarl_irq_handler(0, &irq_data);
+	smb5_usb_plugin_irq_handler(0, &irq_data);
+	smb5_dc_plugin_irq_handler(0, &irq_data);
+	smb5_typec_attach_detach_irq_handler(0, &irq_data);
+	smb5_typec_state_change_irq_handler(0, &irq_data);
+	smb5_usb_source_change_irq_handler(0, &irq_data);
+	smb5_chg_state_change_irq_handler(0, &irq_data);
+	smb5_icl_change_irq_handler(0, &irq_data);
+	smb5_batt_temp_changed_irq_handler(0, &irq_data);
+	smb5_wdog_bark_irq_handler(0, &irq_data);
+	smb5_typec_or_rid_detection_change_irq_handler(0, &irq_data);
+	smb5_wdog_snarl_irq_handler(0, &irq_data);
 
 	return 0;
 }
@@ -2347,11 +2347,11 @@ static struct smb_irq_info smb5_irqs[] = {
 	/* CHARGER IRQs */
 	[CHGR_ERROR_IRQ] = {
 		.name		= "chgr-error",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[CHG_STATE_CHANGE_IRQ] = {
 		.name		= "chg-state-change",
-		.handler	= chg_state_change_irq_handler,
+		.handler	= smb5_chg_state_change_irq_handler,
 		.wake		= true,
 	},
 	[STEP_CHG_STATE_CHANGE_IRQ] = {
@@ -2375,7 +2375,7 @@ static struct smb_irq_info smb5_irqs[] = {
 	/* DCDC IRQs */
 	[OTG_FAIL_IRQ] = {
 		.name		= "otg-fail",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[OTG_OC_DISABLE_SW_IRQ] = {
 		.name		= "otg-oc-disable-sw",
@@ -2388,24 +2388,24 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[HIGH_DUTY_CYCLE_IRQ] = {
 		.name		= "high-duty-cycle",
-		.handler	= high_duty_cycle_irq_handler,
+		.handler	= smb5_high_duty_cycle_irq_handler,
 		.wake		= true,
 	},
 	[INPUT_CURRENT_LIMITING_IRQ] = {
 		.name		= "input-current-limiting",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[CONCURRENT_MODE_DISABLE_IRQ] = {
 		.name		= "concurrent-mode-disable",
 	},
 	[SWITCHER_POWER_OK_IRQ] = {
 		.name		= "switcher-power-ok",
-		.handler	= switcher_power_ok_irq_handler,
+		.handler	= smb5_switcher_power_ok_irq_handler,
 	},
 	/* BATTERY IRQs */
 	[BAT_TEMP_IRQ] = {
 		.name		= "bat-temp",
-		.handler	= batt_temp_changed_irq_handler,
+		.handler	= smb5_batt_temp_changed_irq_handler,
 		.wake		= true,
 	},
 	[ALL_CHNL_CONV_DONE_IRQ] = {
@@ -2413,19 +2413,19 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[BAT_OV_IRQ] = {
 		.name		= "bat-ov",
-		.handler	= batt_psy_changed_irq_handler,
+		.handler	= smb5_batt_psy_changed_irq_handler,
 	},
 	[BAT_LOW_IRQ] = {
 		.name		= "bat-low",
-		.handler	= batt_psy_changed_irq_handler,
+		.handler	= smb5_batt_psy_changed_irq_handler,
 	},
 	[BAT_THERM_OR_ID_MISSING_IRQ] = {
 		.name		= "bat-therm-or-id-missing",
-		.handler	= batt_psy_changed_irq_handler,
+		.handler	= smb5_batt_psy_changed_irq_handler,
 	},
 	[BAT_TERMINAL_MISSING_IRQ] = {
 		.name		= "bat-terminal-missing",
-		.handler	= batt_psy_changed_irq_handler,
+		.handler	= smb5_batt_psy_changed_irq_handler,
 	},
 	[BUCK_OC_IRQ] = {
 		.name		= "buck-oc",
@@ -2436,25 +2436,25 @@ static struct smb_irq_info smb5_irqs[] = {
 	/* USB INPUT IRQs */
 	[USBIN_COLLAPSE_IRQ] = {
 		.name		= "usbin-collapse",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[USBIN_VASHDN_IRQ] = {
 		.name		= "usbin-vashdn",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[USBIN_UV_IRQ] = {
 		.name		= "usbin-uv",
-		.handler	= usbin_uv_irq_handler,
+		.handler	= smb5_usbin_uv_irq_handler,
 		.wake		= true,
 		.storm_data	= {true, 3000, 5},
 	},
 	[USBIN_OV_IRQ] = {
 		.name		= "usbin-ov",
-		.handler	= usbin_ov_irq_handler,
+		.handler	= smb5_usbin_ov_irq_handler,
 	},
 	[USBIN_PLUGIN_IRQ] = {
 		.name		= "usbin-plugin",
-		.handler	= usb_plugin_irq_handler,
+		.handler	= smb5_usb_plugin_irq_handler,
 		.wake           = true,
 	},
 	[USBIN_REVI_CHANGE_IRQ] = {
@@ -2462,12 +2462,12 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[USBIN_SRC_CHANGE_IRQ] = {
 		.name		= "usbin-src-change",
-		.handler	= usb_source_change_irq_handler,
+		.handler	= smb5_usb_source_change_irq_handler,
 		.wake           = true,
 	},
 	[USBIN_ICL_CHANGE_IRQ] = {
 		.name		= "usbin-icl-change",
-		.handler	= icl_change_irq_handler,
+		.handler	= smb5_icl_change_irq_handler,
 		.wake           = true,
 	},
 	/* DC INPUT IRQs */
@@ -2476,16 +2476,16 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[DCIN_UV_IRQ] = {
 		.name		= "dcin-uv",
-		.handler	= dcin_uv_irq_handler,
+		.handler	= smb5_dcin_uv_irq_handler,
 		.wake		= true,
 	},
 	[DCIN_OV_IRQ] = {
 		.name		= "dcin-ov",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[DCIN_PLUGIN_IRQ] = {
 		.name		= "dcin-plugin",
-		.handler	= dc_plugin_irq_handler,
+		.handler	= smb5_dc_plugin_irq_handler,
 		.wake           = true,
 	},
 	[DCIN_REVI_IRQ] = {
@@ -2493,16 +2493,16 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[DCIN_PON_IRQ] = {
 		.name		= "dcin-pon",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[DCIN_EN_IRQ] = {
 		.name		= "dcin-en",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	/* TYPEC IRQs */
 	[TYPEC_OR_RID_DETECTION_CHANGE_IRQ] = {
 		.name		= "typec-or-rid-detect-change",
-		.handler	= typec_or_rid_detection_change_irq_handler,
+		.handler	= smb5_typec_or_rid_detection_change_irq_handler,
 		.wake           = true,
 	},
 	[TYPEC_VPD_DETECT_IRQ] = {
@@ -2510,24 +2510,24 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[TYPEC_CC_STATE_CHANGE_IRQ] = {
 		.name		= "typec-cc-state-change",
-		.handler	= typec_state_change_irq_handler,
+		.handler	= smb5_typec_state_change_irq_handler,
 		.wake           = true,
 	},
 	[TYPEC_VCONN_OC_IRQ] = {
 		.name		= "typec-vconn-oc",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[TYPEC_VBUS_CHANGE_IRQ] = {
 		.name		= "typec-vbus-change",
 	},
 	[TYPEC_ATTACH_DETACH_IRQ] = {
 		.name		= "typec-attach-detach",
-		.handler	= typec_attach_detach_irq_handler,
+		.handler	= smb5_typec_attach_detach_irq_handler,
 		.wake		= true,
 	},
 	[TYPEC_LEGACY_CABLE_DETECT_IRQ] = {
 		.name		= "typec-legacy-cable-detect",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[TYPEC_TRY_SNK_SRC_DETECT_IRQ] = {
 		.name		= "typec-try-snk-src-detect",
@@ -2535,12 +2535,12 @@ static struct smb_irq_info smb5_irqs[] = {
 	/* MISCELLANEOUS IRQs */
 	[WDOG_SNARL_IRQ] = {
 		.name		= "wdog-snarl",
-		.handler	= wdog_snarl_irq_handler,
+		.handler	= smb5_wdog_snarl_irq_handler,
 		.wake		= true,
 	},
 	[WDOG_BARK_IRQ] = {
 		.name		= "wdog-bark",
-		.handler	= wdog_bark_irq_handler,
+		.handler	= smb5_wdog_bark_irq_handler,
 		.wake		= true,
 	},
 	[AICL_FAIL_IRQ] = {
@@ -2548,11 +2548,11 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[AICL_DONE_IRQ] = {
 		.name		= "aicl-done",
-		.handler	= default_irq_handler,
+		.handler	= smb5_default_irq_handler,
 	},
 	[SMB_EN_IRQ] = {
 		.name		= "smb-en",
-		.handler	= smb_en_irq_handler,
+		.handler	= smb5_smb_en_irq_handler,
 	},
 	[IMP_TRIGGER_IRQ] = {
 		.name		= "imp-trigger",
@@ -2563,7 +2563,7 @@ static struct smb_irq_info smb5_irqs[] = {
 	 */
 	[TEMP_CHANGE_IRQ] = {
 		.name		= "temp-change",
-		.handler	= temp_change_irq_handler,
+		.handler	= smb5_temp_change_irq_handler,
 		.wake		= true,
 	},
 	[TEMP_CHANGE_SMB_IRQ] = {
@@ -2575,7 +2575,7 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[ILIM_S2_IRQ] = {
 		.name		= "ilim2-s2",
-		.handler	= schgm_flash_ilim2_irq_handler,
+		.handler	= smb5_schgm_flash_ilim2_irq_handler,
 	},
 	[ILIM_S1_IRQ] = {
 		.name		= "ilim1-s1",
@@ -2588,7 +2588,7 @@ static struct smb_irq_info smb5_irqs[] = {
 	},
 	[FLASH_STATE_CHANGE_IRQ] = {
 		.name		= "flash-state-change",
-		.handler	= schgm_flash_state_change_irq_handler,
+		.handler	= smb5_schgm_flash_state_change_irq_handler,
 	},
 	[TORCH_REQ_IRQ] = {
 		.name		= "torch-req",
@@ -2599,7 +2599,7 @@ static struct smb_irq_info smb5_irqs[] = {
 	/* SDAM */
 	[SDAM_STS_IRQ] = {
 		.name		= "sdam-sts",
-		.handler	= sdam_sts_change_irq_handler,
+		.handler	= smb5_sdam_sts_change_irq_handler,
 	},
 };
 
diff --git a/drivers/power/supply/qcom/schgm-flash.c b/drivers/power/supply/qcom/schgm-flash.c
index b92ace1d4300..482da59d0c9c 100644
--- a/drivers/power/supply/qcom/schgm-flash.c
+++ b/drivers/power/supply/qcom/schgm-flash.c
@@ -24,7 +24,7 @@
 		|| ((left) <= (right) && (left) <= (value) \
 			&& (value) <= (right)))
 
-irqreturn_t schgm_flash_default_irq_handler(int irq, void *data)
+irqreturn_t smb5_schgm_flash_default_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 
@@ -33,7 +33,7 @@ irqreturn_t schgm_flash_default_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t schgm_flash_ilim2_irq_handler(int irq, void *data)
+irqreturn_t smb5_schgm_flash_ilim2_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -47,7 +47,7 @@ irqreturn_t schgm_flash_ilim2_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t schgm_flash_state_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_schgm_flash_state_change_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
diff --git a/drivers/power/supply/qcom/schgm-flash.h b/drivers/power/supply/qcom/schgm-flash.h
index bf7ac585cc17..86a3b25579ad 100644
--- a/drivers/power/supply/qcom/schgm-flash.h
+++ b/drivers/power/supply/qcom/schgm-flash.h
@@ -48,7 +48,7 @@ void schgm_flash_torch_priority(struct smb_charger *chg, enum torch_mode mode);
 int schgm_flash_init(struct smb_charger *chg);
 bool is_flash_active(struct smb_charger *chg);
 
-irqreturn_t schgm_flash_default_irq_handler(int irq, void *data);
-irqreturn_t schgm_flash_ilim2_irq_handler(int irq, void *data);
-irqreturn_t schgm_flash_state_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_schgm_flash_default_irq_handler(int irq, void *data);
+irqreturn_t smb5_schgm_flash_ilim2_irq_handler(int irq, void *data);
+irqreturn_t smb5_schgm_flash_state_change_irq_handler(int irq, void *data);
 #endif /* __SCHGM_FLASH_H__ */
diff --git a/drivers/power/supply/qcom/smb5-lib.c b/drivers/power/supply/qcom/smb5-lib.c
index a96742c4c76b..acf808c15b5d 100644
--- a/drivers/power/supply/qcom/smb5-lib.c
+++ b/drivers/power/supply/qcom/smb5-lib.c
@@ -5059,7 +5059,7 @@ int smblib_set_prop_thermal_overheat(struct smb_charger *chg,
  * INTERRUPT HANDLERS *
  **********************/
 
-irqreturn_t default_irq_handler(int irq, void *data)
+irqreturn_t smb5_default_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5068,7 +5068,7 @@ irqreturn_t default_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t smb_en_irq_handler(int irq, void *data)
+irqreturn_t smb5_smb_en_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5103,7 +5103,7 @@ irqreturn_t smb_en_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t sdam_sts_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_sdam_sts_change_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5156,7 +5156,7 @@ static void smblib_eval_chg_termination(struct smb_charger *chg, u8 batt_status)
 	}
 }
 
-irqreturn_t chg_state_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_chg_state_change_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5181,7 +5181,7 @@ irqreturn_t chg_state_change_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t batt_temp_changed_irq_handler(int irq, void *data)
+irqreturn_t smb5_batt_temp_changed_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5202,7 +5202,7 @@ irqreturn_t batt_temp_changed_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t batt_psy_changed_irq_handler(int irq, void *data)
+irqreturn_t smb5_batt_psy_changed_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5214,7 +5214,7 @@ irqreturn_t batt_psy_changed_irq_handler(int irq, void *data)
 
 #define AICL_STEP_MV		200
 #define MAX_AICL_THRESHOLD_MV	4800
-irqreturn_t usbin_uv_irq_handler(int irq, void *data)
+irqreturn_t smb5_usbin_uv_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5348,7 +5348,7 @@ unsuspend_input:
 
 #define USB_WEAK_INPUT_UA	1400000
 #define ICL_CHANGE_DELAY_MS	1000
-irqreturn_t icl_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_icl_change_irq_handler(int irq, void *data)
 {
 	u8 stat;
 	int rc, settled_ua, delay = ICL_CHANGE_DELAY_MS;
@@ -5564,7 +5564,7 @@ static void smblib_usb_plugin_locked(struct smb_charger *chg)
 					vbus_rising ? "attached" : "detached");
 }
 
-irqreturn_t usb_plugin_irq_handler(int irq, void *data)
+irqreturn_t smb5_usb_plugin_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -5774,7 +5774,7 @@ static void smblib_handle_apsd_done(struct smb_charger *chg, bool rising)
 		   apsd_result->name);
 }
 
-irqreturn_t usb_source_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_usb_source_change_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -6441,7 +6441,7 @@ static void smblib_lpd_launch_ra_open_work(struct smb_charger *chg)
 	}
 }
 
-irqreturn_t typec_or_rid_detection_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_typec_or_rid_detection_change_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -6485,7 +6485,7 @@ out:
 	return IRQ_HANDLED;
 }
 
-irqreturn_t typec_state_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_typec_state_change_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -6523,7 +6523,7 @@ static void smblib_lpd_clear_ra_open_work(struct smb_charger *chg)
 }
 
 #define TYPEC_DETACH_DETECT_DELAY_MS 2000
-irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)
+irqreturn_t smb5_typec_attach_detach_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -6780,7 +6780,7 @@ static void dcin_icl_decrement(struct smb_charger *chg)
 	chg->dcin_uv_last_time = now;
 }
 
-irqreturn_t dcin_uv_irq_handler(int irq, void *data)
+irqreturn_t smb5_dcin_uv_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -6797,7 +6797,7 @@ irqreturn_t dcin_uv_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t dc_plugin_irq_handler(int irq, void *data)
+irqreturn_t smb5_dc_plugin_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -6923,7 +6923,7 @@ irqreturn_t dc_plugin_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t high_duty_cycle_irq_handler(int irq, void *data)
+irqreturn_t smb5_high_duty_cycle_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -6953,7 +6953,7 @@ static void smblib_bb_removal_work(struct work_struct *work)
 #define BOOST_BACK_UNVOTE_DELAY_MS		750
 #define BOOST_BACK_STORM_COUNT			3
 #define WEAK_CHG_STORM_COUNT			8
-irqreturn_t switcher_power_ok_irq_handler(int irq, void *data)
+irqreturn_t smb5_switcher_power_ok_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -7010,7 +7010,7 @@ irqreturn_t switcher_power_ok_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t wdog_snarl_irq_handler(int irq, void *data)
+irqreturn_t smb5_wdog_snarl_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -7028,7 +7028,7 @@ irqreturn_t wdog_snarl_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t wdog_bark_irq_handler(int irq, void *data)
+irqreturn_t smb5_wdog_bark_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -7064,7 +7064,7 @@ static void smblib_die_rst_icl_regulate(struct smb_charger *chg)
  * triggered when DIE or SKIN or CONNECTOR temperature across
  * either of the _REG_L, _REG_H, _RST, or _SHDN thresholds
  */
-irqreturn_t temp_change_irq_handler(int irq, void *data)
+irqreturn_t smb5_temp_change_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
@@ -7085,7 +7085,7 @@ static void smblib_usbov_dbc_work(struct work_struct *work)
 }
 
 #define USB_OV_DBC_PERIOD_MS		1000
-irqreturn_t usbin_ov_irq_handler(int irq, void *data)
+irqreturn_t smb5_usbin_ov_irq_handler(int irq, void *data)
 {
 	struct smb_irq_data *irq_data = data;
 	struct smb_charger *chg = irq_data->parent_data;
diff --git a/drivers/power/supply/qcom/smb5-lib.h b/drivers/power/supply/qcom/smb5-lib.h
index bc6bb76c04ad..83c668d8b430 100644
--- a/drivers/power/supply/qcom/smb5-lib.h
+++ b/drivers/power/supply/qcom/smb5-lib.h
@@ -652,27 +652,27 @@ int smblib_vconn_regulator_enable(struct regulator_dev *rdev);
 int smblib_vconn_regulator_disable(struct regulator_dev *rdev);
 int smblib_vconn_regulator_is_enabled(struct regulator_dev *rdev);
 
-irqreturn_t default_irq_handler(int irq, void *data);
-irqreturn_t smb_en_irq_handler(int irq, void *data);
-irqreturn_t chg_state_change_irq_handler(int irq, void *data);
-irqreturn_t batt_temp_changed_irq_handler(int irq, void *data);
-irqreturn_t batt_psy_changed_irq_handler(int irq, void *data);
-irqreturn_t usbin_uv_irq_handler(int irq, void *data);
-irqreturn_t usb_plugin_irq_handler(int irq, void *data);
-irqreturn_t usb_source_change_irq_handler(int irq, void *data);
-irqreturn_t icl_change_irq_handler(int irq, void *data);
-irqreturn_t typec_state_change_irq_handler(int irq, void *data);
-irqreturn_t typec_attach_detach_irq_handler(int irq, void *data);
-irqreturn_t dcin_uv_irq_handler(int irq, void *data);
-irqreturn_t dc_plugin_irq_handler(int irq, void *data);
-irqreturn_t high_duty_cycle_irq_handler(int irq, void *data);
-irqreturn_t switcher_power_ok_irq_handler(int irq, void *data);
-irqreturn_t wdog_snarl_irq_handler(int irq, void *data);
-irqreturn_t wdog_bark_irq_handler(int irq, void *data);
-irqreturn_t typec_or_rid_detection_change_irq_handler(int irq, void *data);
-irqreturn_t temp_change_irq_handler(int irq, void *data);
-irqreturn_t usbin_ov_irq_handler(int irq, void *data);
-irqreturn_t sdam_sts_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_default_irq_handler(int irq, void *data);
+irqreturn_t smb5_smb_en_irq_handler(int irq, void *data);
+irqreturn_t smb5_chg_state_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_batt_temp_changed_irq_handler(int irq, void *data);
+irqreturn_t smb5_batt_psy_changed_irq_handler(int irq, void *data);
+irqreturn_t smb5_usbin_uv_irq_handler(int irq, void *data);
+irqreturn_t smb5_usb_plugin_irq_handler(int irq, void *data);
+irqreturn_t smb5_usb_source_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_icl_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_typec_state_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_typec_attach_detach_irq_handler(int irq, void *data);
+irqreturn_t smb5_dcin_uv_irq_handler(int irq, void *data);
+irqreturn_t smb5_dc_plugin_irq_handler(int irq, void *data);
+irqreturn_t smb5_high_duty_cycle_irq_handler(int irq, void *data);
+irqreturn_t smb5_switcher_power_ok_irq_handler(int irq, void *data);
+irqreturn_t smb5_wdog_snarl_irq_handler(int irq, void *data);
+irqreturn_t smb5_wdog_bark_irq_handler(int irq, void *data);
+irqreturn_t smb5_typec_or_rid_detection_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_temp_change_irq_handler(int irq, void *data);
+irqreturn_t smb5_usbin_ov_irq_handler(int irq, void *data);
+irqreturn_t smb5_sdam_sts_change_irq_handler(int irq, void *data);
 int smblib_get_prop_input_current_limit_usb(struct smb_charger *chg,
 				union power_supply_propval *val);
 int smblib_get_prop_batt_present(struct smb_charger *chg,