From 4444c1464a6df51f4a7365621617e8e8402a0ae5 Mon Sep 17 00:00:00 2001 From: Frodo Looijaard Date: Sat, 18 Nov 2000 11:38:15 +0000 Subject: [PATCH] Applied patch of Chip Salzenberg : Better #ifdefs git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@929 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/chips/adm1021.c | 4 ++-- kernel/chips/adm9240.c | 4 ++-- kernel/chips/eeprom.c | 4 ++-- kernel/chips/gl518sm.c | 4 ++-- kernel/chips/lm75.c | 4 ++-- kernel/chips/lm78.c | 4 ++-- kernel/chips/lm80.c | 4 ++-- kernel/chips/ltc1710.c | 4 ++-- kernel/chips/sis5595.c | 4 ++-- kernel/chips/w83781d.c | 4 ++-- kernel/sensors.c | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/kernel/chips/adm1021.c b/kernel/chips/adm1021.c index 263c2b4d..02fbe355 100644 --- a/kernel/chips/adm1021.c +++ b/kernel/chips/adm1021.c @@ -29,11 +29,11 @@ #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/adm9240.c b/kernel/chips/adm9240.c index b4f5d41c..4621dfc9 100644 --- a/kernel/chips/adm9240.c +++ b/kernel/chips/adm9240.c @@ -63,11 +63,11 @@ #include "sensors.h" #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/eeprom.c b/kernel/chips/eeprom.c index d5dbb402..c7b3951d 100644 --- a/kernel/chips/eeprom.c +++ b/kernel/chips/eeprom.c @@ -29,11 +29,11 @@ #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/gl518sm.c b/kernel/chips/gl518sm.c index 7f89808c..1a1d6ccd 100644 --- a/kernel/chips/gl518sm.c +++ b/kernel/chips/gl518sm.c @@ -34,11 +34,11 @@ #include #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/lm75.c b/kernel/chips/lm75.c index d806c6e5..0d62fad7 100644 --- a/kernel/chips/lm75.c +++ b/kernel/chips/lm75.c @@ -28,11 +28,11 @@ #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/lm78.c b/kernel/chips/lm78.c index f1e0ed09..48afa3e9 100644 --- a/kernel/chips/lm78.c +++ b/kernel/chips/lm78.c @@ -33,11 +33,11 @@ #include "sensors.h" #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/lm80.c b/kernel/chips/lm80.c index aebf4319..826eb3c7 100644 --- a/kernel/chips/lm80.c +++ b/kernel/chips/lm80.c @@ -34,11 +34,11 @@ #include "sensors.h" #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/ltc1710.c b/kernel/chips/ltc1710.c index 44a3454b..fcee3c1a 100644 --- a/kernel/chips/ltc1710.c +++ b/kernel/chips/ltc1710.c @@ -51,11 +51,11 @@ #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/sis5595.c b/kernel/chips/sis5595.c index 727c6bca..2d123025 100644 --- a/kernel/chips/sis5595.c +++ b/kernel/chips/sis5595.c @@ -37,11 +37,11 @@ #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c index 6f26e029..03e9f244 100644 --- a/kernel/chips/w83781d.c +++ b/kernel/chips/w83781d.c @@ -47,11 +47,11 @@ #include "sensors.h" #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)) +#ifndef init_MUTEX #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif diff --git a/kernel/sensors.c b/kernel/sensors.c index 32f09f78..57b50ef1 100644 --- a/kernel/sensors.c +++ b/kernel/sensors.c @@ -41,7 +41,7 @@ extern int cleanup_module(void); static int sensors_cleanup(void); #endif /* MODULE */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13) +#ifndef THIS_MODULE #define THIS_MODULE NULL #endif