diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
index e851c045b..f39697fee 100644
--- a/drivers/led/Kconfig
+++ b/drivers/led/Kconfig
@@ -6,6 +6,7 @@
 config AMLOGIC_LED
 	tristate "Amlogic LED Support"
 	default n
+	depends on LEDS_CLASS
 	help
 	  amlogic led support
 	  select y for built-in
@@ -15,11 +16,9 @@ config AMLOGIC_LED
 	  If you say N, all options in this submenu will be
 	  skipped and disabled.
 
-if AMLOGIC_LED
-
 config AMLOGIC_LEDS_TLC59116
 	bool "LED Support for the TLC59116"
-	depends on LEDS_CLASS
+	depends on AMLOGIC_LED
 	default n
 	help
 	  Choose this option if you want to use the LED on
@@ -27,7 +26,7 @@ config AMLOGIC_LEDS_TLC59116
 
 config AMLOGIC_LEDS_AW9523B
 	bool "LED Support for the AW9523B"
-	depends on LEDS_CLASS
+	depends on AMLOGIC_LED
 	default n
 	help
 	  Choose this option if you want to use the LED on
@@ -35,7 +34,7 @@ config AMLOGIC_LEDS_AW9523B
 
 config AMLOGIC_LEDS_STATE
 	bool "LED state support"
-	depends on LEDS_CLASS
+	depends on AMLOGIC_LED
 	default n
 	help
 	  Choose this option if you want to use the LED state
@@ -43,7 +42,7 @@ config AMLOGIC_LEDS_STATE
 
 config AMLOGIC_LEDS_DCON
 	bool "DCON LED support"
-	depends on LEDS_CLASS
+	depends on AMLOGIC_LED
 	default n
 	help
 	  Choose this option if you want to use the DCON LED
@@ -51,10 +50,8 @@ config AMLOGIC_LEDS_DCON
 
 config AMLOGIC_LEDS_FD650
 	bool "LEDS_DISPLAY"
-	depends on LEDS_CLASS
+	depends on AMLOGIC_LED
 	default n
 	help
 	  Choose this option if you want to use the LEDS display
 	  function
-
-endif
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 73cd21677..faaae09cf 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -3,6 +3,7 @@
 config AMLOGIC_PWM
 	tristate "Amlogic PWM Support"
 	default n
+	depends on COMMON_CLK && HAS_IOMEM
 	help
 	  amlogic pwm support
 	  select y for built-in
@@ -12,18 +13,15 @@ config AMLOGIC_PWM
 	  If you say N, all options in this submenu will be
 	  skipped and disabled.
 
-if AMLOGIC_PWM
-
 config AMLOGIC_PWM_MESON
 	bool "Amlogic Meson PWM driver"
-	depends on COMMON_CLK && HAS_IOMEM
+	depends on AMLOGIC_PWM
 	help
 	  The platform driver for Amlogic Meson PWM controller.
 
 config AMLOGIC_PWM_MESON_TEE
 	bool "Amlogic Meson PWM TEE driver"
-	depends on COMMON_CLK && HAS_IOMEM
+	depends on AMLOGIC_PWM
 	help
 	  The platform driver for Amlogic Meson PWM TEE controller.
 
-endif