Show
Ignore:
Timestamp:
05/28/01 00:49:28 (13 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/adm9240.c

    r1015 r1101  
    316316   when a new copy is allocated. */ 
    317317static ctl_table adm9240_dir_table_template[] = { 
    318         {ADM9240_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real, 
    319          &sensors_sysctl_real, NULL, &adm9240_in}, 
    320         {ADM9240_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real, 
    321          &sensors_sysctl_real, NULL, &adm9240_in}, 
    322         {ADM9240_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real, 
    323          &sensors_sysctl_real, NULL, &adm9240_in}, 
    324         {ADM9240_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real, 
    325          &sensors_sysctl_real, NULL, &adm9240_in}, 
    326         {ADM9240_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real, 
    327          &sensors_sysctl_real, NULL, &adm9240_in}, 
    328         {ADM9240_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &sensors_proc_real, 
    329          &sensors_sysctl_real, NULL, &adm9240_in}, 
    330         {ADM9240_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real, 
    331          &sensors_sysctl_real, NULL, &adm9240_fan}, 
    332         {ADM9240_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &sensors_proc_real, 
    333          &sensors_sysctl_real, NULL, &adm9240_fan}, 
    334         {ADM9240_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &sensors_proc_real, 
    335          &sensors_sysctl_real, NULL, &adm9240_temp}, 
    336         {ADM9240_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &sensors_proc_real, 
    337          &sensors_sysctl_real, NULL, &adm9240_fan_div}, 
    338         {ADM9240_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real, 
    339          &sensors_sysctl_real, NULL, &adm9240_alarms}, 
    340         {ADM9240_SYSCTL_ANALOG_OUT, "analog_out", NULL, 0, 0644, NULL, &sensors_proc_real, 
    341          &sensors_sysctl_real, NULL, &adm9240_analog_out}, 
    342         {ADM9240_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &sensors_proc_real, 
    343          &sensors_sysctl_real, NULL, &adm9240_vid}, 
     318        {ADM9240_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, 
     319         &i2c_sysctl_real, NULL, &adm9240_in}, 
     320        {ADM9240_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, 
     321         &i2c_sysctl_real, NULL, &adm9240_in}, 
     322        {ADM9240_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, 
     323         &i2c_sysctl_real, NULL, &adm9240_in}, 
     324        {ADM9240_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, 
     325         &i2c_sysctl_real, NULL, &adm9240_in}, 
     326        {ADM9240_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real, 
     327         &i2c_sysctl_real, NULL, &adm9240_in}, 
     328        {ADM9240_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, 
     329         &i2c_sysctl_real, NULL, &adm9240_in}, 
     330        {ADM9240_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, 
     331         &i2c_sysctl_real, NULL, &adm9240_fan}, 
     332        {ADM9240_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real, 
     333         &i2c_sysctl_real, NULL, &adm9240_fan}, 
     334        {ADM9240_SYSCTL_TEMP, "temp", NULL, 0, 0644, NULL, &i2c_proc_real, 
     335         &i2c_sysctl_real, NULL, &adm9240_temp}, 
     336        {ADM9240_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real, 
     337         &i2c_sysctl_real, NULL, &adm9240_fan_div}, 
     338        {ADM9240_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real, 
     339         &i2c_sysctl_real, NULL, &adm9240_alarms}, 
     340        {ADM9240_SYSCTL_ANALOG_OUT, "analog_out", NULL, 0, 0644, NULL, &i2c_proc_real, 
     341         &i2c_sysctl_real, NULL, &adm9240_analog_out}, 
     342        {ADM9240_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &i2c_proc_real, 
     343         &i2c_sysctl_real, NULL, &adm9240_vid}, 
    344344        {0} 
    345345}; 
     
    347347int adm9240_attach_adapter(struct i2c_adapter *adapter) 
    348348{ 
    349         return sensors_detect(adapter, &addr_data, adm9240_detect); 
     349        return i2c_detect(adapter, &addr_data, adm9240_detect); 
    350350} 
    351351 
     
    361361 
    362362        /* Make sure we aren't probing the ISA bus!! This is just a safety check 
    363            at this moment; sensors_detect really won't call us. */ 
     363           at this moment; i2c_detect really won't call us. */ 
    364364#ifdef DEBUG 
    365365        if (i2c_is_isa_adapter(adapter)) { 
     
    452452 
    453453        /* Register a new directory entry with module sensors */ 
    454         if ((i = sensors_register_entry(new_client, 
     454        if ((i = i2c_register_entry(new_client, 
    455455                                        type_name, 
    456456                                        adm9240_dir_table_template, 
     
    481481        int err; 
    482482 
    483         sensors_deregister_entry(((struct adm9240_data *) (client->data))-> 
     483        i2c_deregister_entry(((struct adm9240_data *) (client->data))-> 
    484484                                 sysctl_id); 
    485485