From 91f63a34062625ef3625ea5056076d4ca5f9ae28 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 7 Nov 2002 08:43:03 +0000
Subject: [PATCH] Stick to usual declarations for lm92 static arrays (needed
 for         proper documentation building)

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1578 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 kernel/chips/lm92.c | 31 +++++++++++-------------------
 lib/chips.c         | 47 +++++++++++++++------------------------------
 2 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/kernel/chips/lm92.c b/kernel/chips/lm92.c
index c316564d..4b94f427 100644
--- a/kernel/chips/lm92.c
+++ b/kernel/chips/lm92.c
@@ -60,20 +60,16 @@
 #define NATIVE_TO_PROC(x) ((x) * 625)
 #define CELSIUS(x) ((x) * 16)
 
-#define ENTRY(name,proc,perm,callback)		\
-	{										\
-		ctl_name:		name,				\
-		procname:		proc,				\
-		data:			NULL,				\
-		maxlen:			0,					\
-		mode:			perm,				\
-		child:			NULL,				\
-		proc_handler:	&i2c_proc_real,		\
-		strategy:		&i2c_sysctl_real,	\
-		de:				NULL,				\
-		extra1:			callback,			\
-		extra2:			NULL				\
-	}
+static void lm92_temp (struct i2c_client *client,int operation,int ctl_name,int *nrels_mag,long *results);
+static void lm92_alarms (struct i2c_client *client,int operation,int ctl_name,int *nrels_mag,long *results);
+
+static ctl_table lm92_dir_table[] = {
+	{LM92_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &i2c_proc_real,
+	 &i2c_sysctl_real, NULL, &lm92_temp, NULL},
+	{LM92_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real,
+	 &i2c_sysctl_real, NULL, &lm92_alarms, NULL},
+	{0}
+};
 
 /* NOTE: all temperatures are degrees centigrade * 16 */
 typedef struct {
@@ -261,11 +257,6 @@ static int lm92_init_client (struct i2c_client *client)
 
 static int lm92_detect (struct i2c_adapter *adapter,int address,unsigned short flags,int kind)
 {
-	static ctl_table dir_table[] = {
-		ENTRY (LM92_SYSCTL_TEMP,"temp",0644,&lm92_temp),
-		ENTRY (LM92_SYSCTL_ALARMS,"alarms",0444,&lm92_alarms),
-		{ 0 }
-	};
 	static int id = 0;
 	struct i2c_client *client;
 	lm92_t *data;
@@ -304,7 +295,7 @@ static int lm92_detect (struct i2c_adapter *adapter,int address,unsigned short f
 		return (result);
 	}
 
-	if ((result = i2c_register_entry (client,client->name,dir_table,THIS_MODULE)) < 0) {
+	if ((result = i2c_register_entry (client,client->name,lm92_dir_table,THIS_MODULE)) < 0) {
 		i2c_detach_client (client);
 		kfree (client);
 		up (&mutex);
diff --git a/lib/chips.c b/lib/chips.c
index b0a32516..b6179a01 100644
--- a/lib/chips.c
+++ b/lib/chips.c
@@ -2825,39 +2825,22 @@ static sensors_chip_feature smsc47m1_features[] =
     { 0 }
   };
 
-#define LM92_TEMP(_idx,_name,_mapping,_mode,_offset)	\
-	{													\
-		number:				_idx,						\
-		name:				_name,						\
-		logical_mapping:	_mapping,					\
-		compute_mapping:	_mapping,					\
-		mode:				_mode,						\
-		sysctl:				LM92_SYSCTL_TEMP,			\
-		offset:				VALUE(_offset),				\
-		scaling:			4							\
-	}
-
-#define LM92_ALARM(_idx,_name,_mapping,_offset)			\
-	{													\
-		number:				_idx,						\
-		name:				_name,						\
-		logical_mapping:	_mapping,					\
-		compute_mapping:	_mapping,					\
-		mode:				SENSORS_MODE_R,				\
-		sysctl:				LM92_SYSCTL_ALARMS,			\
-		offset:				VALUE(_offset),				\
-		scaling:			0							\
-	}
-
 static sensors_chip_feature lm92_features[] =
-{
-	LM92_TEMP (SENSORS_LM92_TEMP,"temp",SENSORS_NO_MAPPING,SENSORS_MODE_R,1),
-	LM92_TEMP (SENSORS_LM92_TEMP_HIGH,"temp_high",SENSORS_LM92_TEMP,SENSORS_MODE_RW,2),
-	LM92_TEMP (SENSORS_LM92_TEMP_LOW,"temp_low",SENSORS_LM92_TEMP,SENSORS_MODE_RW,3),
-	LM92_TEMP (SENSORS_LM92_TEMP_CRIT,"temp_crit",SENSORS_LM92_TEMP,SENSORS_MODE_RW,4),
-	LM92_TEMP (SENSORS_LM92_TEMP_HYST,"temp_hyst",SENSORS_LM92_TEMP,SENSORS_MODE_RW,5),
-	LM92_ALARM (SENSORS_LM92_ALARMS,"alarms",SENSORS_NO_MAPPING,1),
-};
+  {
+    { SENSORS_LM92_TEMP, "temp", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                       SENSORS_MODE_R, LM92_SYSCTL_TEMP, VALUE(1), 4 },
+    { SENSORS_LM92_TEMP_HIGH, "temp_high", SENSORS_LM92_TEMP, SENSORS_LM92_TEMP,
+                       SENSORS_MODE_RW, LM92_SYSCTL_TEMP, VALUE(2), 4 },
+    { SENSORS_LM92_TEMP_LOW, "temp_low", SENSORS_LM92_TEMP, SENSORS_LM92_TEMP,
+                       SENSORS_MODE_RW, LM92_SYSCTL_TEMP, VALUE(3), 4 },
+    { SENSORS_LM92_TEMP_CRIT, "temp_crit", SENSORS_LM92_TEMP, SENSORS_LM92_TEMP,
+                       SENSORS_MODE_RW, LM92_SYSCTL_TEMP, VALUE(4), 4 },
+    { SENSORS_LM92_TEMP_HYST, "temp_hyst", SENSORS_LM92_TEMP, SENSORS_LM92_TEMP,
+                       SENSORS_MODE_RW, LM92_SYSCTL_TEMP, VALUE(5), 4 },
+    { SENSORS_LM92_ALARMS, "alarms", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                       SENSORS_MODE_R, LM92_SYSCTL_ALARMS, VALUE(1), 0 },
+    { 0 }
+  };
 
 static sensors_chip_feature vt8231_features[] =
   {