Changeset 1705

Show
Ignore:
Timestamp:
01/21/03 21:01:27 (6 years ago)
Author:
kmalkki
Message:

(Kyösti) Cleanups

Copy sysctl enums to chip drivers from sensors.h for now,
as seen in drivers included in 2.5 tree. File no longer included
from kernel side.

Apply i2c-proc change in CVS tagged -km2.

Partial clean and sort of includes everywhere.

Add i2c-dev.h, as a partial copy from i2c.
Add to sensors.h from i2c-proc.h to compile things.
Remove i2c-isa.h.

Reflect header file changes to lib/ and prog/.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/kernel/busses/dmi_scan.c

    r1698 r1705  
    1212#include <linux/apm_bios.h> 
    1313#include <linux/slab.h> 
     14#include <linux/pm.h> 
    1415#include <asm/io.h> 
    15 #include <linux/pm.h> 
    1616#include <asm/keyboard.h> 
    1717#include <asm/system.h> 

  • lm-sensors/trunk/kernel/busses/i2c-ali1535.c

    r1698 r1705  
    5454/* Note: we assume there can only be one ALI1535, with one SMBus interface */ 
    5555 
    56 #include <linux/version.h> 
    5756#include <linux/module.h> 
    5857#include <linux/pci.h> 
    59 #include <asm/io.h> 
    60 #include <asm/semaphore.h> 
    6158#include <linux/kernel.h> 
    6259#include <linux/stddef.h> 
    …… 
    6461#include <linux/ioport.h> 
    6562#include <linux/i2c.h> 
     63#include <linux/init.h> 
     64#include <asm/io.h> 
     65#include <asm/semaphore.h> 
    6666#include "version.h" 
    67 #include <linux/init.h> 
    68  
    69 MODULE_LICENSE("GPL"); 
    70  
    71 #ifndef DECLARE_MUTEX 
    72 #define DECLARE_MUTEX(name)  struct semaphore name = MUTEX 
    73 #endif /* def DECLARE_MUTEX */ 
     67 
    7468 
    7569/* ALI1535 SMBus address offsets */ 
    …… 
    623617     "Mark D. Studebaker <mdsxyz123@yahoo.com> and Dan Eaton <dan.eaton@rocketlogix.com>"); 
    624618MODULE_DESCRIPTION("ALI1535 SMBus driver"); 
     619MODULE_LICENSE("GPL"); 
    625620 
    626621module_init(i2c_ali1535_init); 

  • lm-sensors/trunk/kernel/busses/i2c-ali15x3.c

    r1698 r1705  
    6161/* Note: we assume there can only be one ALI15X3, with one SMBus interface */ 
    6262 
    63 #include <linux/version.h> 
    6463#include <linux/module.h> 
    6564#include <linux/pci.h> 
    66 #include <asm/io.h> 
    6765#include <linux/kernel.h> 
    6866#include <linux/stddef.h> 
    …… 
    7068#include <linux/ioport.h> 
    7169#include <linux/i2c.h> 
     70#include <linux/init.h> 
     71#include <asm/io.h> 
    7272#include "version.h" 
    73 #include <linux/init.h> 
    74  
    75 MODULE_LICENSE("GPL"); 
    7673 
    7774/* ALI15X3 SMBus address offsets */ 
    …… 
    587584    ("Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker <mdsxyz123@yahoo.com>"); 
    588585MODULE_DESCRIPTION("ALI15X3 SMBus driver"); 
     586MODULE_LICENSE("GPL"); 
    589587 
    590588module_init(i2c_ali15x3_init); 

  • lm-sensors/trunk/kernel/busses/i2c-amd756.c

    r1698 r1705  
    3636*/ 
    3737 
    38 #include <linux/version.h> 
    3938#include <linux/module.h> 
    4039#include <linux/pci.h> 
    …… 
    4443#include <linux/ioport.h> 
    4544#include <linux/i2c.h> 
    46 #include "version.h" 
    4745#include <linux/init.h> 
    4846#include <asm/io.h> 
     47#include "version.h" 
    4948 
    5049#define DRV_NAME        "i2c-amd756" 

  • lm-sensors/trunk/kernel/busses/i2c-amd8111.c

    r1698 r1705  
    99 */ 
    1010 
    11 #include <linux/version.h> 
    1211#include <linux/module.h> 
    1312#include <linux/pci.h> 
    14 #include <asm/io.h> 
    1513#include <linux/kernel.h> 
    1614#include <linux/stddef.h> 
    …… 
    2018#include <linux/i2c.h> 
    2119#include <linux/delay.h> 
     20#include <asm/io.h> 
    2221#include "version.h" 
    2322 

  • lm-sensors/trunk/kernel/busses/i2c-hydra.c

    r1698 r1705  
    2525*/ 
    2626 
    27 #include <linux/version.h> 
    2827#include <linux/kernel.h> 
    2928#include <linux/module.h> 
    3029#include <linux/pci.h> 
    31 #include <asm/io.h> 
    32 #include <asm/system.h> 
    3330#include <linux/types.h> 
    3431#include <linux/i2c.h> 
    3532#include <linux/i2c-algo-bit.h> 
    3633#include <linux/init.h> 
     34#include <asm/io.h> 
     35#include <asm/system.h> 
    3736 
    3837MODULE_LICENSE("GPL"); 

  • lm-sensors/trunk/kernel/busses/i2c-i801.c

    r1698 r1705  
    4040/* #define DEBUG 1 */ 
    4141 
    42 #include <linux/version.h> 
    4342#include <linux/module.h> 
    4443#include <linux/pci.h> 
    45 #include <asm/io.h> 
    4644#include <linux/kernel.h> 
    4745#include <linux/stddef.h> 
    …… 
    5048#include <linux/init.h> 
    5149#include <linux/i2c.h> 
     50#include <asm/io.h> 
    5251#include "version.h" 
    5352 

  • lm-sensors/trunk/kernel/busses/i2c-i810.c

    r1698 r1705  
    3636 
    3737 
    38 #include <linux/version.h> 
    3938#include <linux/module.h> 
    4039#include <linux/pci.h> 
    41 #include <asm/io.h> 
    4240#include <linux/i2c.h> 
    4341#include <linux/i2c-algo-bit.h> 
     42#include <linux/init.h> 
     43#include <asm/io.h> 
    4444#include "version.h" 
    45 #include <linux/init.h> 
    4645 
    4746MODULE_LICENSE("GPL"); 

  • lm-sensors/trunk/kernel/busses/i2c-isa.c

    r1698 r1705  
    2525   of this. */ 
    2626 
    27 #include <linux/version.h> 
     27#include <linux/init.h> 
    2828#include <linux/module.h> 
    2929#include <linux/kernel.h> 
     30#include <linux/errno.h> 
    3031#include <linux/i2c.h> 
    31 #include <linux/init.h> 
    3232#include "version.h" 
    33  
    34 MODULE_LICENSE("GPL"); 
    35  
    36  
    37 /* We can't do a thing... */ 
    38 static u32 isa_func(struct i2c_adapter *adapter) 
    39 { 
    40         return 0; 
    41 } 
    4233 
    4334/* This is the actual algorithm we define */ 
    …… 
    4536        .name           = "ISA bus algorithm", 
    4637        .id             = I2C_ALGO_ISA, 
    47         .functionality  = isa_func, 
    4838}; 
    4939 
    …… 
    6252} 
    6353 
    64  
    6554static void __exit i2c_isa_exit(void) 
    6655{ 
    …… 
    6857} 
    6958 
    70  
    71  
    7259MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); 
    7360MODULE_DESCRIPTION("ISA bus access through i2c"); 
     61MODULE_LICENSE("GPL"); 
    7462 
    7563module_init(i2c_isa_init); 

  • lm-sensors/trunk/kernel/busses/i2c-keywest.c

    r1698 r1705  
    4646#include <linux/module.h> 
    4747#include <linux/config.h> 
    48 #include <linux/version.h> 
    4948#include <linux/kernel.h> 
    5049#include <linux/ioport.h> 

  • lm-sensors/trunk/kernel/busses/i2c-piix4.c

    r1698 r1705  
    3333#include <linux/config.h> 
    3434#include <linux/pci.h> 
    35 #include <asm/io.h> 
    3635#include <linux/kernel.h> 
    3736#include <linux/stddef.h> 
    …… 
    3938#include <linux/ioport.h> 
    4039#include <linux/i2c.h> 
    41 #include "version.h" 
    4240#include <linux/init.h> 
    4341#include <linux/apm_bios.h> 
     42#include <asm/io.h> 
     43#include "version.h" 
    4444#include "dmi_scan.h" 
    4545 

  • lm-sensors/trunk/kernel/busses/i2c-savage4.c

    r1698 r1705  
    3232*/ 
    3333 
    34 #include <linux/version.h> 
    3534#include <linux/module.h> 
    3635#include <linux/pci.h> 
    37 #include <asm/io.h> 
    3836#include <linux/i2c.h> 
    3937#include <linux/i2c-algo-bit.h> 
     38#include <linux/init.h> 
     39#include <asm/io.h> 
    4040#include "version.h" 
    41 #include <linux/init.h> 
    4241 
    4342/* 3DFX defines */ 

  • lm-sensors/trunk/kernel/busses/i2c-sis5595.c

    r1698 r1705  
    5050 */ 
    5151 
    52 #include <linux/version.h> 
    5352#include <linux/module.h> 
    5453#include <linux/pci.h> 
    55 #include <asm/io.h> 
    5654#include <linux/kernel.h> 
    5755#include <linux/stddef.h> 
    …… 
    5957#include <linux/ioport.h> 
    6058#include <linux/i2c.h> 
     59#include <linux/init.h> 
     60#include <asm/io.h> 
    6161#include "version.h" 
    62 #include <linux/init.h> 
    6362 
    6463MODULE_LICENSE("GPL"); 

  • lm-sensors/trunk/kernel/busses/i2c-sis630.c

    r1698 r1705  
    4949*/ 
    5050 
    51 #include <linux/version.h> 
    5251#include <linux/module.h> 
    53 #include <asm/io.h> 
    5452#include <linux/kernel.h> 
    5553#include <linux/pci.h> 
    …… 
    5856#include <linux/ioport.h> 
    5957#include <linux/i2c.h> 
     58#include <linux/init.h> 
     59#include <asm/io.h> 
    6060#include "version.h" 
    61 #include <linux/init.h> 
    6261 
    6362#ifndef PCI_VENDOR_ID_SI 

  • lm-sensors/trunk/kernel/busses/i2c-sis645.c

    r1704 r1705  
    3535*/ 
    3636 
    37 #include <linux/version.h> 
    3837#include <linux/module.h> 
    3938#include <linux/pci.h> 
    40 #include <asm/io.h> 
    4139#include <linux/kernel.h> 
    4240#include <linux/stddef.h> 
    …… 
    4442#include <linux/ioport.h> 
    4543#include <linux/i2c.h> 
     44#include <linux/init.h> 
     45#include <asm/io.h> 
    4646#include "version.h" 
    47 #include <linux/init.h> 
    4847 
    4948#define DRV_NAME "i2c-sis645" 

  • lm-sensors/trunk/kernel/busses/i2c-tsunami.c

    r1698 r1705  
    3030*/  
    3131 
    32 #include <linux/version.h> 
    3332#include <linux/module.h> 
     33#include <linux/i2c.h> 
     34#include <linux/i2c-algo-bit.h> 
     35#include <linux/init.h> 
    3436#include <asm/io.h> 
    3537#include <asm/hwrpb.h> 
    3638#include <asm/core_tsunami.h> 
    37 #include <linux/i2c.h> 
    38 #include <linux/i2c-algo-bit.h> 
    3939#include "version.h" 
    40 #include <linux/init.h> 
    4140 
    4241MODULE_LICENSE("GPL"); 

  • lm-sensors/trunk/kernel/busses/i2c-via.c

    r1698 r1705  
    2222*/ 
    2323 
    24 #include <linux/version.h> 
    2524#include <linux/kernel.h> 
    2625#include <linux/ioport.h> 
    2726#include <linux/module.h> 
    2827#include <linux/pci.h> 
    29 #include <asm/io.h> 
    3028#include <linux/types.h> 
    3129#include <linux/i2c.h> 
    3230#include <linux/i2c-algo-bit.h> 
     31#include <linux/init.h> 
     32#include <asm/io.h> 
    3333#include "version.h" 
    34 #include <linux/init.h> 
    3534 
    3635MODULE_LICENSE("GPL"); 

  • lm-sensors/trunk/kernel/busses/i2c-viapro.c

    r1698 r1705  
    3333*/ 
    3434 
    35 #include <linux/version.h> 
    3635#include <linux/module.h> 
    3736#include <linux/pci.h> 
    38 #include <asm/io.h> 
    3937#include <linux/kernel.h> 
    4038#include <linux/stddef.h> 
    …… 
    4240#include <linux/ioport.h> 
    4341#include <linux/i2c.h> 
     42#include <linux/init.h> 
     43#include <asm/io.h> 
    4444#include "version.h" 
    45 #include <linux/init.h> 
    4645 
    4746#ifndef PCI_DEVICE_ID_VIA_82C596_3 

  • lm-sensors/trunk/kernel/busses/i2c-voodoo3.c

    r1698 r1705  
    2828    the BT869 and possibly other I2C devices. */ 
    2929 
    30 #include <linux/version.h> 
    3130#include <linux/module.h> 
    3231#include <linux/pci.h> 
    33 #include <asm/io.h> 
    3432#include <linux/i2c.h> 
    3533#include <linux/i2c-algo-bit.h> 
     34#include <linux/init.h> 
     35#include <asm/io.h> 
    3636#include "version.h" 
    37 #include <linux/init.h> 
    3837 
    3938MODULE_LICENSE("GPL"); 

  • lm-sensors/trunk/kernel/chips/adm1021.c

    r1698 r1705  
    2020*/ 
    2121 
    22 #include <linux/version.h> 
    2322#include <linux/module.h> 
    2423#include <linux/slab.h> 
    2524#include <linux/i2c.h> 
    26 #include "sensors.h" 
     25#include <linux/i2c-proc.h> 
     26#include <linux/init.h> 
    2727#include "version.h" 
    28 #include <linux/init.h> 
    29  
    3028 
    3129/* Addresses to scan */ 
    …… 
    119117static void adm1021_init_client(struct i2c_client *client); 
    120118static int adm1021_detach_client(struct i2c_client *client); 
    121 static int adm1021_command(struct i2c_client *client, unsigned int cmd, 
    122                            void *arg); 
    123119static int adm1021_read_value(struct i2c_client *client, u8 reg); 
    124120static int adm1021_rd_good(u8 *val, struct i2c_client *client, u8 reg, u8 mask); 
    …… 
    148144        .attach_adapter = adm1021_attach_adapter, 
    149145        .detach_client  = adm1021_detach_client, 
    150         .command        = adm1021_command, 
    151146}; 
     147 
     148/* -- SENSORS SYSCTL START -- */ 
     149 
     150#define ADM1021_SYSCTL_TEMP 1200 
     151#define ADM1021_SYSCTL_REMOTE_TEMP 1201 
     152#define ADM1021_SYSCTL_DIE_CODE 1202 
     153#define ADM1021_SYSCTL_ALARMS 1203 
     154 
     155#define ADM1021_ALARM_TEMP_HIGH 0x40 
     156#define ADM1021_ALARM_TEMP_LOW 0x20 
     157#define ADM1021_ALARM_RTEMP_HIGH 0x10 
     158#define ADM1021_ALARM_RTEMP_LOW 0x08 
     159#define ADM1021_ALARM_RTEMP_NA 0x04 
     160 
     161/* -- SENSORS SYSCTL END -- */ 
    152162 
    153163/* These files are created for each detected adm1021. This is just a template; 
    …… 
    311321 
    312322        /* Register a new directory entry with module sensors */ 
    313         if ((i = i2c_register_entry(new_client, 
    314                                         type_name, 
    315                                         data->type == 
    316                                         adm1021 ? 
    317                                         adm1021_dir_table_template : 
    318                                         adm1021_max_dir_table_template, 
    319                                         THIS_MODULE)) < 0) { 
     323        if ((i = i2c_register_entry(new_client, type_name, 
     324                                        data->type == adm1021 ? adm1021_dir_table_template : 
     325                                        adm1021_max_dir_table_template)) < 0) { 
    320326                err = i; 
    321327                goto error4; 
    …… 
    371377        return 0; 
    372378 
    373 } 
    374  
    375  
    376 /* No commands defined yet */ 
    377 static int adm1021_command(struct i2c_client *client, unsigned int cmd, void *arg) 
    378 { 
    379         return 0; 
    380379} 
    381380 

  • lm-sensors/trunk/kernel/chips/adm1024.c

    r1698 r1705  
    2424/* Supports the Analog Devices ADM1024. See doc/chips/adm1024 for details */ 
    2525 
    26 #include <linux/version.h> 
    2726#include <linux/module.h> 
    2827#include <linux/slab.h> 
    …… 
    3029#include <linux/ioport.h> 
    3130#include <linux/sysctl.h> 
     31#include <linux/types.h> 
     32#include <linux/i2c.h> 
     33#include <linux/i2c-proc.h> 
     34#include <linux/init.h> 
    3235#include <asm/errno.h> 
    3336#include <asm/io.h> 
    34 #include <linux/types.h> 
    35 #include <linux/i2c.h> 
    3637#include "version.h" 
    37 #include "sensors.h" 
    38 #include <linux/init.h> 
    3938 
    4039/* Addresses to scan */ 
    …… 
    232231                          unsigned short flags, int kind); 
    233232static int adm1024_detach_client(struct i2c_client *client); 
    234 static int adm1024_command(struct i2c_client *client, unsigned int cmd, 
    235                            void *arg); 
    236233 
    237234static int adm1024_read_value(struct i2c_client *client, u8 register); 
    …… 
    274271        .attach_adapter = adm1024_attach_adapter, 
    275272        .detach_client  = adm1024_detach_client, 
    276         .command        = adm1024_command, 
    277273}; 
    278274 
    279275/* The /proc/sys entries */ 
     276/* -- SENSORS SYSCTL START -- */ 
     277 
     278#define ADM1024_SYSCTL_IN0 1000 /* Volts * 100 */ 
     279#define ADM1024_SYSCTL_IN1 1001 
     280#define ADM1024_SYSCTL_IN2 1002 
     281#define ADM1024_SYSCTL_IN3 1003 
     282#define ADM1024_SYSCTL_IN4 1004 
     283#define ADM1024_SYSCTL_IN5 1005 
     284#define ADM1024_SYSCTL_FAN1 1101        /* Rotations/min */ 
     285#define ADM1024_SYSCTL_FAN2 1102 
     286#define ADM1024_SYSCTL_TEMP 1250        /* Degrees Celcius * 100 */ 
     287#define ADM1024_SYSCTL_TEMP1 1290       /* Degrees Celcius */ 
     288#define ADM1024_SYSCTL_TEMP2 1295       /* Degrees Celcius */ 
     289#define ADM1024_SYSCTL_FAN_DIV 2000     /* 1, 2, 4 or 8 */ 
     290#define ADM1024_SYSCTL_ALARMS 2001      /* bitvector */ 
     291#define ADM1024_SYSCTL_ANALOG_OUT 2002 
     292#define ADM1024_SYSCTL_VID 2003 
     293 
     294#define ADM1024_ALARM_IN0 0x0001 
     295#define ADM1024_ALARM_IN1 0x0002 
     296#define ADM1024_ALARM_IN2 0x0004 
     297#define ADM1024_ALARM_IN3 0x0008 
     298#define ADM1024_ALARM_IN4 0x0100 
     299#define ADM1024_ALARM_IN5 0x0200 
     300#define ADM1024_ALARM_FAN1 0x0040 
     301#define ADM1024_ALARM_FAN2 0x0080 
     302#define ADM1024_ALARM_TEMP 0x0010 
     303#define ADM1024_ALARM_TEMP1 0x0020 
     304#define ADM1024_ALARM_TEMP2 0x0001 
     305#define ADM1024_ALARM_CHAS 0x1000 
     306 
     307/* -- SENSORS SYSCTL END -- */ 
     308 
    280309/* These files are created for each detected ADM1024. This is just a template; 
    281310   though at first sight, you might think we could use a statically 
    …… 
    411440        if ((i = i2c_register_entry(new_client, 
    412441                                        type_name, 
    413                                         adm1024_dir_table_template, 
    414                                         THIS_MODULE)) < 0) { 
     442                                        adm1024_dir_table_template)) < 0) { 
    415443                err = i; 
    416444                goto ERROR4; 
    …… 
    452480 
    453481} 
    454  
    455 /* No commands defined yet */ 
    456 static int adm1024_command(struct i2c_client *client, unsigned int cmd, void *arg) 
    457 { 
    458         return 0; 
    459 } 
    460  
    461482 
    462483static int adm1024_read_value(struct i2c_client *client, u8 reg) 

  • lm-sensors/trunk/kernel/chips/adm1025.c

    r1698 r1705  
    2323/* Supports the Analog Devices ADM1025. See doc/chips/adm1025 for details */ 
    2424 
    25 #include <linux/version.h> 
    2625#include <linux/module.h> 
    2726#include <linux/slab.h> 
    …… 
    2928#include <linux/ioport.h> 
    3029#include <linux/sysctl.h> 
     30#include <linux/types.h> 
     31#include <linux/i2c.h> 
     32#include <linux/i2c-proc.h> 
     33#include <linux/init.h> 
    3134#include <asm/errno.h> 
    3235#include <asm/io.h> 
    33 #include <linux/types.h> 
    34 #include <linux/i2c.h> 
    3536#include "version.h" 
    36 #include "sensors.h" 
    3737#include "sensors_vid.h" 
    38 #include <linux/init.h> 
    3938 
    4039MODULE_LICENSE("GPL"); 
    …… 
    179178                          unsigned short flags, int kind); 
    180179static int adm1025_detach_client(struct i2c_client *client); 
    181 static int adm1025_command(struct i2c_client *client, unsigned int cmd, 
    182                            void *arg); 
    183180static int adm1025_read_value(struct i2c_client *client, u8 register); 
    184181static int adm1025_write_value(struct i2c_client *client, u8 register, 
    …… 
    216213        .attach_adapter = adm1025_attach_adapter, 
    217214        .detach_client  = adm1025_detach_client, 
    218         .command        = adm1025_command, 
    219215}; 
    220216 
    221217/* The /proc/sys entries */ 
     218/* -- SENSORS SYSCTL START -- */ 
     219 
     220#define ADM1025_SYSCTL_IN0 1000 /* Volts * 100 */ 
     221#define ADM1025_SYSCTL_IN1 1001 
     222#define ADM1025_SYSCTL_IN2 1002 
     223#define ADM1025_SYSCTL_IN3 1003 
     224#define ADM1025_SYSCTL_IN4 1004 
     225#define ADM1025_SYSCTL_IN5 1005 
     226#define ADM1025_SYSCTL_RTEMP 1251 
     227#define ADM1025_SYSCTL_TEMP 1250        /* Degrees Celcius * 100 */ 
     228#define ADM1025_SYSCTL_ALARMS 2001      /* bitvector */ 
     229#define ADM1025_SYSCTL_ANALOG_OUT 2002 
     230#define ADM1025_SYSCTL_VID 2003 
     231#define ADM1025_SYSCTL_VRM 2004 
     232 
     233#define ADM1025_ALARM_IN0 0x0001 
     234#define ADM1025_ALARM_IN1 0x0002 
     235#define ADM1025_ALARM_IN2 0x0004 
     236#define ADM1025_ALARM_IN3 0x0008 
     237#define ADM1025_ALARM_IN4 0x0100 
     238#define ADM1025_ALARM_IN5 0x0200 
     239#define ADM1025_ALARM_RTEMP 0x0020 
     240#define ADM1025_ALARM_TEMP 0x0010 
     241 
     242/* -- SENSORS SYSCTL END -- */ 
     243 
    222244/* These files are created for each detected ADM1025. This is just a template; 
    223245   though at first sight, you might think we could use a statically 
    …… 
    347369        if ((i = i2c_register_entry(new_client, 
    348370                                        type_name, 
    349                                         adm1025_dir_table_template, 
    350                                         THIS_MODULE)) < 0) { 
     371                                        adm1025_dir_table_template)) < 0) { 
    351372                err = i; 
    352373                goto ERROR4; 
    …… 
    388409 
    389410} 
    390  
    391 /* No commands defined yet */ 
    392 static int adm1025_command(struct i2c_client *client, unsigned int cmd, void *arg) 
    393 { 
    394         return 0; 
    395 } 
    396  
    397411 
    398412static int adm1025_read_value(struct i2c_client *client, u8 reg) 

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

    r1698 r1705  
    4848*/ 
    4949 
    50  
    51 #include <linux/version.h> 
    5250#include <linux/module.h> 
    5351#include <linux/slab.h> 
    …… 
    5553#include <linux/ioport.h> 
    5654#include <linux/sysctl.h> 
     55#include <linux/types.h> 
     56#include <linux/i2c.h> 
     57#include <linux/i2c-proc.h> 
     58#include <linux/init.h> 
    5759#include <asm/errno.h> 
    5860#include <asm/io.h> 
    59 #include <linux/types.h> 
    60 #include <linux/i2c.h> 
    6161#include "version.h" 
    62 #include "sensors.h" 
    63 #include <linux/init.h> 
    6462 
    6563MODULE_LICENSE("GPL"); 
    …… 
    242240                          unsigned short flags, int kind); 
    243241static int adm9240_detach_client(struct i2c_client *client); 
    244 static int adm9240_command(struct i2c_client *client, unsigned int cmd, 
    245                            void *arg); 
    246242 
    247243static int adm9240_read_value(struct i2c_client *client, u8 register); 
    …… 
    280276        .attach_adapter = adm9240_attach_adapter, 
    281277        .detach_client  = adm9240_detach_client, 
    282         .command        = adm9240_command, 
    283278}; 
    284279 
    285280/* The /proc/sys entries */ 
     281 
     282/* -- SENSORS SYSCTL START -- */ 
     283 
     284#define ADM9240_SYSCTL_IN0 1000 /* Volts * 100 */ 
     285#define ADM9240_SYSCTL_IN1 1001 
     286#define ADM9240_SYSCTL_IN2 1002 
     287#define ADM9240_SYSCTL_IN3 1003 
     288#define ADM9240_SYSCTL_IN4 1004 
     289#define ADM9240_SYSCTL_IN5 1005 
     290#define ADM9240_SYSCTL_FAN1 1101        /* Rotations/min */ 
     291#define ADM9240_SYSCTL_FAN2 1102 
     292#define ADM9240_SYSCTL_TEMP 1250        /* Degrees Celcius * 100 */ 
     293#define ADM9240_SYSCTL_FAN_DIV 2000     /* 1, 2, 4 or 8 */ 
     294#define ADM9240_SYSCTL_ALARMS 2001      /* bitvector */ 
     295#define ADM9240_SYSCTL_ANALOG_OUT 2002 
     296#define ADM9240_SYSCTL_VID 2003 
     297 
     298#define ADM9240_ALARM_IN0 0x0001 
     299#define ADM9240_ALARM_IN1 0x0002 
     300#define ADM9240_ALARM_IN2 0x0004 
     301#define ADM9240_ALARM_IN3 0x0008 
     302#define ADM9240_ALARM_IN4 0x0100 
     303#define ADM9240_ALARM_IN5 0x0200 
     304#define ADM9240_ALARM_FAN1 0x0040 
     305#define ADM9240_ALARM_FAN2 0x0080 
     306#define ADM9240_ALARM_TEMP 0x0010 
     307#define ADM9240_ALARM_CHAS 0x1000 
     308 
     309/* -- SENSORS SYSCTL END -- */ 
     310 
    286311/* These files are created for each detected ADM9240. This is just a template; 
    287312   though at first sight, you might think we could use a statically 
    …… 
    428453        if ((i = i2c_register_entry(new_client, 
    429454                                        type_name, 
    430                                         adm9240_dir_table_template, 
    431                                         THIS_MODULE)) < 0) { 
     455                                        adm9240_dir_table_template)) < 0) { 
    432456                err = i; 
    433457                goto ERROR4; 
    …… 
    468492        return 0; 
    469493 
    470 } 
    471  
    472 /* No commands defined yet */ 
    473 static int adm9240_command(struct i2c_client *client, unsigned int cmd, void *arg) 
    474 { 
    475         return 0; 
    476494} 
    477495 

  • lm-sensors/trunk/kernel/chips/bmcsensors.c

    r1698 r1705  
    2020*/ 
    2121 
    22 #include <linux/version.h> 
    2322#include <linux/module.h> 
    2423#include <linux/slab.h> 
    2524#include <linux/proc_fs.h> 
    2625#include <linux/sysctl.h> 
     26#include <linux/types.h> 
     27#include <linux/i2c.h> 
     28#include <linux/i2c-proc.h> 
     29#include <linux/ipmi.h> 
     30#include <linux/init.h> 
    2731#include <asm/errno.h> 
    2832#include <asm/io.h> 
    29 #include <linux/types.h> 
    30 #include <linux/i2c.h> 
    31 #include <linux/ipmi.h> 
    3233#include "version.h" 
    33 #include "sensors.h" 
    34 #include <linux/init.h> 
    3534 
    3635static unsigned short normal_i2c[] = { SENSORS_I2C_END }; 
    …… 
    132131static int sdrd_count; 
    133132 
     133 
     134/* -- SENSORS SYSCTL START -- */ 
     135#define BMC_SYSCTL_IN1 1000 
     136#define BMC_SYSCTL_TEMP1 1100 
     137#define BMC_SYSCTL_CURR1 1200 
     138#define BMC_SYSCTL_FAN1 1300 
     139#define BMC_SYSCTL_ALARMS 5000 
     140 
     141/* -- SENSORS SYSCTL END -- */ 
     142 
    134143#define MAX_PROC_ENTRIES (MAX_SDR_ENTRIES + 5) 
    135144#define MAX_PROCNAME_SIZE 8 
    …… 
    377386 
    378387        if ((i = i2c_register_entry(&bmc_client, "bmc", 
    379                                     bmcsensors_dir_table, 
    380                                     THIS_MODULE)) < 0) { 
     388                                    bmcsensors_dir_table) < 0) { 
    381389                printk(KERN_INFO "bmcsensors.o: i2c registration failed.\n"); 
    382390                kfree(bmcsensors_dir_table); 

  • lm-sensors/trunk/kernel/chips/bt869.c

    r1698 r1705  
    2424#define DEBUG 1 
    2525 
    26 #include <linux/version.h> 
    2726#include <linux/module.h> 
    2827#include <linux/slab.h> 
    2928#include <linux/i2c.h> 
    30 #include "sensors.h" 
     29#include <linux/i2c-proc.h> 
     30#include <linux/init.h> 
    3131#include "version.h" 
    32 #include <linux/init.h> 
    3332 
    3433MODULE_LICENSE("GPL"); 
    …… 
    8281static void bt869_init_client(struct i2c_client *client); 
    8382static int bt869_detach_client(struct i2c_client *client); 
    84 static int bt869_command(struct i2c_client *client, unsigned int cmd, 
    85                          void *arg); 
    8683static int bt869_read_value(struct i2c_client *client, u8 reg); 
    8784static int bt869_write_value(struct i2c_client *client, u8 reg, u16 value); 
    …… 
    112109        .attach_adap