Changeset 1101 for lm-sensors/trunk/kernel/chips/adm9240.c

Timestamp:

05/28/01 00:49:28 (12 years ago)

Author:

mds

Message:

Change from sensors_x to i2c_x for x =

_sysctl_real
_register_entry
_proc_real
_detect
_deregister_entry
_chips_data

which were the global symbols renamed in i2c-proc.[ch] in the
i2c package.

Files:

• lm-sensors/trunk/kernel/chips/adm9240.c (modified) (5 diffs)

lm-sensors/trunk/kernel/chips/adm9240.c

@@ -316 +316 @@
    when a new copy is allocated. */
 static ctl_table adm9240_dir_table_template[] = {
-        {ADM9240_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_in},
-        {ADM9240_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_in},
-        {ADM9240_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_in},
-        {ADM9240_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_in},
-        {ADM9240_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_in},
-        {ADM9240_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_in},
-        {ADM9240_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_fan},
-        {ADM9240_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_fan},
-        {ADM9240_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_temp},
-        {ADM9240_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_fan_div},
-        {ADM9240_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_alarms},
-        {ADM9240_SYSCTL_ANALOG_OUT, "analog_out", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_analog_out},
-        {ADM9240_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm9240_vid},
+        {ADM9240_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_in},
+        {ADM9240_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_in},
+        {ADM9240_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_in},
+        {ADM9240_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_in},
+        {ADM9240_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_in},
+        {ADM9240_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_in},
+        {ADM9240_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_fan},
+        {ADM9240_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_fan},
+        {ADM9240_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_temp},
+        {ADM9240_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_fan_div},
+        {ADM9240_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_alarms},
+        {ADM9240_SYSCTL_ANALOG_OUT, "analog_out", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_analog_out},
+        {ADM9240_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &adm9240_vid},
         {0}
 };
@@ -347 +347 @@
 int adm9240_attach_adapter(struct i2c_adapter *adapter)
 {
-        return sensors_detect(adapter, &addr_data, adm9240_detect);
+        return i2c_detect(adapter, &addr_data, adm9240_detect);
 }
 
@@ -361 +361 @@
 
         /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; sensors_detect really won't call us. */
+           at this moment; i2c_detect really won't call us. */
 #ifdef DEBUG
         if (i2c_is_isa_adapter(adapter)) {
@@ -452 +452 @@
 
         /* Register a new directory entry with module sensors */
-        if ((i = sensors_register_entry(new_client,
+        if ((i = i2c_register_entry(new_client,
                                         type_name,
                                         adm9240_dir_table_template,
@@ -481 +481 @@
         int err;
 
-        sensors_deregister_entry(((struct adm9240_data *) (client->data))->
+        i2c_deregister_entry(((struct adm9240_data *) (client->data))->
                                  sysctl_id);