Show
Ignore:
Timestamp:
05/28/01 00:49:28 (14 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:
1 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/trunk/kernel/chips/sis5595.c

    r1094 r1101  
    279279   when a new copy is allocated. */ 
    280280static ctl_table sis5595_dir_table_template[] = { 
    281         {SIS5595_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real, 
    282          &sensors_sysctl_real, NULL, &sis5595_in}, 
    283         {SIS5595_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real, 
    284          &sensors_sysctl_real, NULL, &sis5595_in}, 
    285         {SIS5595_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real, 
    286          &sensors_sysctl_real, NULL, &sis5595_in}, 
    287         {SIS5595_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real, 
    288          &sensors_sysctl_real, NULL, &sis5595_in}, 
    289         {SIS5595_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real, 
    290          &sensors_sysctl_real, NULL, &sis5595_in}, 
    291         {SIS5595_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real, 
    292          &sensors_sysctl_real, NULL, &sis5595_fan}, 
    293         {SIS5595_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &sensors_proc_real, 
    294          &sensors_sysctl_real, NULL, &sis5595_fan}, 
    295         {SIS5595_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &sensors_proc_real, 
    296          &sensors_sysctl_real, NULL, &sis5595_temp}, 
    297         {SIS5595_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &sensors_proc_real, 
    298          &sensors_sysctl_real, NULL, &sis5595_fan_div}, 
    299         {SIS5595_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real, 
    300          &sensors_sysctl_real, NULL, &sis5595_alarms}, 
     281        {SIS5595_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, 
     282         &i2c_sysctl_real, NULL, &sis5595_in}, 
     283        {SIS5595_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, 
     284         &i2c_sysctl_real, NULL, &sis5595_in}, 
     285        {SIS5595_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, 
     286         &i2c_sysctl_real, NULL, &sis5595_in}, 
     287        {SIS5595_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, 
     288         &i2c_sysctl_real, NULL, &sis5595_in}, 
     289        {SIS5595_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, 
     290         &i2c_sysctl_real, NULL, &sis5595_in}, 
     291        {SIS5595_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, 
     292         &i2c_sysctl_real, NULL, &sis5595_fan}, 
     293        {SIS5595_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, 
     294         &i2c_sysctl_real, NULL, &sis5595_fan}, 
     295        {SIS5595_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &i2c_proc_real, 
     296         &i2c_sysctl_real, NULL, &sis5595_temp}, 
     297        {SIS5595_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, 
     298         &i2c_sysctl_real, NULL, &sis5595_fan_div}, 
     299        {SIS5595_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, 
     300         &i2c_sysctl_real, NULL, &sis5595_alarms}, 
    301301        {0} 
    302302}; 
     
    305305int sis5595_attach_adapter(struct i2c_adapter *adapter) 
    306306{ 
    307         return sensors_detect(adapter, &addr_data, sis5595_detect); 
     307        return i2c_detect(adapter, &addr_data, sis5595_detect); 
    308308} 
    309309 
     
    438438 
    439439        /* Register a new directory entry with module sensors */ 
    440         if ((i = sensors_register_entry((struct i2c_client *) new_client, 
     440        if ((i = i2c_register_entry((struct i2c_client *) new_client, 
    441441                                        type_name, 
    442442                                        sis5595_dir_table_template, 
     
    463463        int err; 
    464464 
    465         sensors_deregister_entry(((struct sis5595_data *) (client->data))-> 
     465        i2c_deregister_entry(((struct sis5595_data *) (client->data))-> 
    466466                                 sysctl_id); 
    467467