diff --git a/drivers/regulator/slg5bm43670/Makefile b/drivers/regulator/slg5bm43670/Makefile
index 4191dea22679..bfbdc14740ef 100644
--- a/drivers/regulator/slg5bm43670/Makefile
+++ b/drivers/regulator/slg5bm43670/Makefile
@@ -1,10 +1,14 @@
-KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
+all: modules
 
-all:
-	$(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS)
+modules:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS)
 
 modules_install:
-	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install
+	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install
+
+%:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS)
 
 clean:
-	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
+	rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers
+	rm -rf .tmp_versions
diff --git a/drivers/regulator/slg5bm43670/slg5bm43670-regulator.c b/drivers/regulator/slg5bm43670/slg5bm43670-regulator.c
index 60c29b8c9cba..ae717269a139 100644
--- a/drivers/regulator/slg5bm43670/slg5bm43670-regulator.c
+++ b/drivers/regulator/slg5bm43670/slg5bm43670-regulator.c
@@ -423,17 +423,17 @@ static irqreturn_t slg51000_irq_handler(int irq, void *data)
 	for (i = 0; i < SLG51000_MAX_REGULATORS; i++) {
 		if (!(evt[i][R2] & SLG51000_IRQ_ILIM_FLAG_MASK) &&
 		    (evt[i][R0] & SLG51000_EVT_ILIM_FLAG_MASK)) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0) && LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 			regulator_lock(chip->rdev[i]);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 			mutex_lock(&chip->rdev[i]->mutex);
 #endif
 			regulator_notifier_call_chain(chip->rdev[i],
 						REGULATOR_EVENT_OVER_CURRENT,
 						NULL);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0) && LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 			regulator_unlock(chip->rdev[i]);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 			mutex_unlock(&chip->rdev[i]->mutex);
 #endif
 			if (evt[i][R1] & SLG51000_STA_ILIM_FLAG_MASK)
@@ -448,17 +448,17 @@ static irqreturn_t slg51000_irq_handler(int irq, void *data)
 		for (i = 0; i < SLG51000_MAX_REGULATORS; i++) {
 			if (!(evt[i][R1] & SLG51000_STA_ILIM_FLAG_MASK) &&
 			    (evt[i][R1] & SLG51000_STA_VOUT_OK_FLAG_MASK)) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0) && LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 				regulator_lock(chip->rdev[i]);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 				mutex_lock(&chip->rdev[i]->mutex);
 #endif
 				regulator_notifier_call_chain(chip->rdev[i],
 						REGULATOR_EVENT_OVER_TEMP,
 						NULL);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0) && LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 				regulator_unlock(chip->rdev[i]);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
 				mutex_unlock(&chip->rdev[i]->mutex);
 #endif
 			}