diff --git a/drivers/misc/awinic/sarsensor/Android.mk b/drivers/misc/awinic/sarsensor/Android.mk
index 4ba116078b65..c9500f25e070 100644
--- a/drivers/misc/awinic/sarsensor/Android.mk
+++ b/drivers/misc/awinic/sarsensor/Android.mk
@@ -12,5 +12,6 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/sensors_class.ko
 #LOCAL_REQUIRED_MODULES := sensors_class.ko
 KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
+KBUILD_OPTIONS += MODULE_KERNEL_VERSION=$(TARGET_KERNEL_VERSION)
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
diff --git a/drivers/misc/awinic/sarsensor/Makefile b/drivers/misc/awinic/sarsensor/Makefile
index 62a13fd28500..ebf65dd9e5b8 100644
--- a/drivers/misc/awinic/sarsensor/Makefile
+++ b/drivers/misc/awinic/sarsensor/Makefile
@@ -1,3 +1,16 @@
+ifeq ($(strip $(MODULE_KERNEL_VERSION)), 5.15)
+all: modules
+modules:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS)
+modules_install:
+	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install
+%:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS)
+clean:
+	rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers
+	rm -rf .tmp_versions
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../sensors/$(GKI_OBJ_MODULE_DIR)/Module.symvers
+else
 KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
 
 all:
@@ -9,3 +22,4 @@ modules_install:
 clean:
 	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
 
+endif
diff --git a/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c b/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c
index b0299bee930a..5bedd21128f9 100644
--- a/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c
+++ b/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c
@@ -310,7 +310,6 @@ static void aw963xx_irq_handle_func(uint32_t irq_status, void *data)
 {
 	int8_t i = 0;
 	int8_t j = 0;
-	int32_t ret = 0;
 	uint32_t curr_status_val[4] = { 0 };
 
 	struct aw_sar *p_sar = (struct aw_sar *)data;
@@ -318,7 +317,7 @@ static void aw963xx_irq_handle_func(uint32_t irq_status, void *data)
 	AWLOGD(p_sar->dev, "IRQSRC = 0x%x", irq_status);
 
 	for (i = 0; i < AW963XX_VALID_TH; i++)
-		ret = aw_sar_i2c_read(p_sar->i2c, REG_STAT0 + i * (REG_STAT1 - REG_STAT0), &curr_status_val[i]);
+		aw_sar_i2c_read(p_sar->i2c, REG_STAT0 + i * (REG_STAT1 - REG_STAT0), &curr_status_val[i]);
 
 	for (j = 0; j < AW963XX_CHANNEL_NUM_MAX; j++) {
 		if (p_sar->channels_arr[j].input == NULL) {