diff --git a/.checkpatch.conf b/.checkpatch.conf
index c294e7bf40..1bf0a321fb 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -20,6 +20,8 @@
 --ignore SPDX_LICENSE_TAG
 --ignore UNDOCUMENTED_DT_STRING
 --ignore PRINTK_WITHOUT_KERN_LEVEL
+--ignore ASSIGN_IN_IF
+--ignore UNNECESSARY_ELSE
 
 # FILE_PATH_CHANGES seems to not be working correctly. It will
 # choke on added / deleted files even if the MAINTAINERS file