Changeset 1101 for lm-sensors/trunk/kernel/chips/sis5595.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/sis5595.c (modified) (4 diffs)

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

@@ -279 +279 @@
    when a new copy is allocated. */
 static ctl_table sis5595_dir_table_template[] = {
-        {SIS5595_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_in},
-        {SIS5595_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_in},
-        {SIS5595_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_in},
-        {SIS5595_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_in},
-        {SIS5595_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_in},
-        {SIS5595_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_fan},
-        {SIS5595_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_fan},
-        {SIS5595_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_temp},
-        {SIS5595_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_fan_div},
-        {SIS5595_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &sis5595_alarms},
+        {SIS5595_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_in},
+        {SIS5595_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_in},
+        {SIS5595_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_in},
+        {SIS5595_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_in},
+        {SIS5595_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_in},
+        {SIS5595_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_fan},
+        {SIS5595_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_fan},
+        {SIS5595_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_temp},
+        {SIS5595_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_fan_div},
+        {SIS5595_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &sis5595_alarms},
         {0}
 };
@@ -305 +305 @@
 int sis5595_attach_adapter(struct i2c_adapter *adapter)
 {
-        return sensors_detect(adapter, &addr_data, sis5595_detect);
+        return i2c_detect(adapter, &addr_data, sis5595_detect);
 }
 
@@ -438 +438 @@
 
         /* Register a new directory entry with module sensors */
-        if ((i = sensors_register_entry((struct i2c_client *) new_client,
+        if ((i = i2c_register_entry((struct i2c_client *) new_client,
                                         type_name,
                                         sis5595_dir_table_template,
@@ -463 +463 @@
         int err;
 
-        sensors_deregister_entry(((struct sis5595_data *) (client->data))->
+        i2c_deregister_entry(((struct sis5595_data *) (client->data))->
                                  sysctl_id);