From e3fe21cc9f6ceb1a1b10d33456b8c24d64c710b4 Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Sat, 16 Dec 2000 20:41:47 +0000 Subject: [PATCH] rename /proc entries temp and remote_temp to temp1 and temp2. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@960 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 3 ++- kernel/chips/adm1021.c | 8 ++++---- kernel/chips/thmc50.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index a4193b8c..2eca53a4 100644 --- a/CHANGES +++ b/CHANGES @@ -23,6 +23,7 @@ ask CVS about it: File sensors.conf.eg: Add mtp008 entries, adm1025 entries Library: Add ds1621, mtp008 support Module adm1021: Add support for adm1021a / adm1023 + Modules adm1021, thmc50: Rename /proc entries to temp[1-2] Module adm1025: Add support for remote temp; rename /proc entries to in[0-5] and temp[1-2]; fix negative temp readings Module adm9240: Rename /proc entries to in[0-5] @@ -42,7 +43,7 @@ ask CVS about it: min/max or limit/hysteresis; print message if no sensors are found. Program sensors-detect: Add ds1621, mtp008 detection; - add ServerWorks detection (no driver yet) + add ServerWorks detection 2.5.4 (20001012) Module i2c-viapro: Add support for Via 596B (0x3051) diff --git a/kernel/chips/adm1021.c b/kernel/chips/adm1021.c index 64133579..89134ece 100644 --- a/kernel/chips/adm1021.c +++ b/kernel/chips/adm1021.c @@ -172,9 +172,9 @@ static struct i2c_driver adm1021_driver = { is done through one of the 'extra' fields which are initialized when a new copy is allocated. */ static ctl_table adm1021_dir_table_template[] = { - {ADM1021_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM1021_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm1021_temp}, - {ADM1021_SYSCTL_REMOTE_TEMP, "remote_temp", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM1021_SYSCTL_REMOTE_TEMP, "temp2", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm1021_remote_temp}, {ADM1021_SYSCTL_DIE_CODE, "die_code", NULL, 0, 0444, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm1021_die_code}, @@ -184,9 +184,9 @@ static ctl_table adm1021_dir_table_template[] = { }; static ctl_table adm1021_max_dir_table_template[] = { - {ADM1021_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM1021_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm1021_temp}, - {ADM1021_SYSCTL_REMOTE_TEMP, "remote_temp", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM1021_SYSCTL_REMOTE_TEMP, "temp2", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm1021_remote_temp}, {ADM1021_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm1021_alarms}, diff --git a/kernel/chips/thmc50.c b/kernel/chips/thmc50.c index 497e2056..c27fc9d1 100644 --- a/kernel/chips/thmc50.c +++ b/kernel/chips/thmc50.c @@ -156,9 +156,9 @@ static struct i2c_driver thmc50_driver = { is done through one of the 'extra' fields which are initialized when a new copy is allocated. */ static ctl_table thmc50_dir_table_template[] = { - {THMC50_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &sensors_proc_real, + {THMC50_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &thmc50_temp}, - {THMC50_SYSCTL_REMOTE_TEMP, "remote_temp", NULL, 0, 0644, NULL, &sensors_proc_real, + {THMC50_SYSCTL_REMOTE_TEMP, "temp2", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &thmc50_remote_temp}, {THMC50_SYSCTL_INTER, "inter", NULL, 0, 0444, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &thmc50_inter},