From b8303e033764b6fbfd74ab387ba880caed87827a Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 24 Jan 2015 22:13:31 +0000
Subject: kernel: eliminate a few kernel_patchver_*/CompareKernelPatchVer calls

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44114
---
 package/kernel/linux/modules/hwmon.mk |  2 +-
 package/kernel/linux/modules/leds.mk  | 13 +++++++------
 package/kernel/linux/modules/usb.mk   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'package')

diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 9d012dcfc4..cd089228bc 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -46,7 +46,7 @@ $(eval $(call KernelPackage,hwmon-vid))
 
 define KernelPackage/hwmon-adt7410
   TITLE:=ADT7410 monitoring support
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.10.0)),1)
+ifeq ($(CONFIG_LINUX_3_8)),)
   KCONFIG:= \
 	CONFIG_SENSORS_ADT7X10 \
 	CONFIG_SENSORS_ADT7410
diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk
index 2b2f81ce37..5a5c76a6d9 100644
--- a/package/kernel/linux/modules/leds.mk
+++ b/package/kernel/linux/modules/leds.mk
@@ -22,12 +22,13 @@ endef
 
 $(eval $(call KernelPackage,leds-gpio))
 
+LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds$(if $(CONFIG_LINUX_3_8),,/trigger)
 
 define KernelPackage/ledtrig-heartbeat
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED Heartbeat Trigger
   KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT
-  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-heartbeat.ko
+  FILES:=$(LED_TRIGGER_DIR)/ledtrig-heartbeat.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat)
 endef
 
@@ -42,7 +43,7 @@ define KernelPackage/ledtrig-gpio
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED GPIO Trigger
   KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO
-  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-gpio.ko
+  FILES:=$(LED_TRIGGER_DIR)/ledtrig-gpio.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio)
 endef
 
@@ -124,7 +125,7 @@ define KernelPackage/ledtrig-default-on
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED Default ON Trigger
   KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON
-  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-default-on.ko
+  FILES:=$(LED_TRIGGER_DIR)/ledtrig-default-on.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on,1)
 endef
 
@@ -139,7 +140,7 @@ define KernelPackage/ledtrig-timer
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED Timer Trigger
   KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER
-  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-timer.ko
+  FILES:=$(LED_TRIGGER_DIR)/ledtrig-timer.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer,1)
 endef
 
@@ -155,7 +156,7 @@ define KernelPackage/ledtrig-transient
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED Transient Trigger
   KCONFIG:=CONFIG_LEDS_TRIGGER_TRANSIENT
-  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-transient.ko
+  FILES:=$(LED_TRIGGER_DIR)/ledtrig-transient.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-transient,1)
 endef
 
@@ -170,7 +171,7 @@ define KernelPackage/ledtrig-oneshot
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED One-Shot Trigger
   KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT
-  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko
+  FILES:=$(LED_TRIGGER_DIR)/ledtrig-oneshot.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot)
 endef
 
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 9e5a1ebe58..3db70f8951 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -338,7 +338,7 @@ define KernelPackage/usb-ohci
 	CONFIG_USB_OHCI_HCD_OMAP3=y \
 	CONFIG_USB_OHCI_HCD_PLATFORM=y
   FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.11.0)),1)
+ifeq ($(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),)
   FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko
 endif
   AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1)
-- 
cgit v1.2.3