Changeset 4245

Show
Ignore:
Timestamp:
11/27/06 21:17:55 (8 years ago)
Author:
khali
Message:

GCC4 and whitespace changes to sync with the Linux 2.4 tree.

Location:
i2c/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • i2c/trunk/doc/summary

    r4158 r4245  
    3838a separate Adapter and Algorithm driver), and drivers for your I2C devices 
    3939(usually one driver for each device). There are no I2C device drivers 
    40 in this package. See the lm_sensors project http://www.lm-sensors.org 
     40in this package. See the lm_sensors project http://www.lm-sensors.org/ 
    4141for device drivers. 
    4242 
  • i2c/trunk/kernel/i2c-core.c

    r4189 r4245  
    315315                if (adapter->clients[i] && (adapter->clients[i]->addr == addr)) 
    316316                        return -EBUSY; 
    317  
    318317        return 0; 
    319318} 
     
    489488                if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE) 
    490489                        client->usage_count++; 
    491                 else if (client->usage_count > 0)  
     490                else if (client->usage_count > 0) 
    492491                        return -EBUSY; 
    493                 else  
     492                else 
    494493                        client->usage_count++; 
    495494        } 
     
    685684 */ 
    686685 
    687 int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num) 
     686int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs,int num) 
    688687{ 
    689688        int ret; 
     
    13471346 
    13481347 
    1349 s32 i2c_smbus_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags, 
     1348s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags, 
    13501349                   char read_write, u8 command, int size,  
    13511350                   union i2c_smbus_data * data) 
     
    13551354        flags &= I2C_M_TEN | I2C_CLIENT_PEC; 
    13561355 
    1357         if (adap->algo->smbus_xfer) { 
    1358                 down(&adap->bus); 
    1359                 res = adap->algo->smbus_xfer(adap,addr,flags,read_write, 
     1356        if (adapter->algo->smbus_xfer) { 
     1357                down(&adapter->bus); 
     1358                res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write, 
    13601359                                                command,size,data); 
    1361                 up(&adap->bus); 
     1360                up(&adapter->bus); 
    13621361        } else 
    1363                 res = i2c_smbus_xfer_emulated(adap,addr,flags,read_write, 
     1362                res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write, 
    13641363                                              command,size,data); 
    13651364 
  • i2c/trunk/kernel/i2c-elektor.c

    r3935 r4245  
    186186 */ 
    187187static struct i2c_algo_pcf_data pcf_isa_data = { 
    188         .setpcf     = pcf_isa_setbyte, 
    189         .getpcf     = pcf_isa_getbyte, 
    190         .getown     = pcf_isa_getown, 
    191         .getclock   = pcf_isa_getclock, 
    192         .waitforpin = pcf_isa_waitforpin, 
    193         .udelay     = 10, 
    194         .mdelay     = 10, 
    195         .timeout    = HZ, 
     188        .setpcf         = pcf_isa_setbyte, 
     189        .getpcf         = pcf_isa_getbyte, 
     190        .getown         = pcf_isa_getown, 
     191        .getclock       = pcf_isa_getclock, 
     192        .waitforpin     = pcf_isa_waitforpin, 
     193        .udelay         = 10, 
     194        .mdelay         = 10, 
     195        .timeout        = HZ, 
    196196}; 
    197197 
  • i2c/trunk/kernel/i2c-id.h

    r4020 r4245  
    101101#define I2C_DRIVERID_UDA1342    53      /* UDA1342 audio codec          */ 
    102102#define I2C_DRIVERID_ADV7170    54      /* video encoder                */ 
    103 #define I2C_DRIVERID_RADEON     55      /* I2C bus on Radeon boards     */ 
    104103#define I2C_DRIVERID_MAX1617    56      /* temp sensor                  */ 
    105 #define I2C_DRIVERID_SAA7191    57      /* video encoder                */ 
     104#define I2C_DRIVERID_SAA7191    57      /* video decoder                */ 
    106105#define I2C_DRIVERID_INDYCAM    58      /* SGI IndyCam                  */ 
    107106#define I2C_DRIVERID_BT832      59      /* CMOS camera video processor  */ 
     
    111110#define I2C_DRIVERID_MAX6900    63      /* MAX6900 real-time clock      */ 
    112111#define I2C_DRIVERID_SAA7114H   64      /* video decoder                */ 
    113  
    114112 
    115113#define I2C_DRIVERID_EXP0       0xF0    /* experimental use id's        */ 
     
    203201#define I2C_ALGO_IOP3XX 0x140000        /* XSCALE IOP3XX On-chip I2C alg */ 
    204202#define I2C_ALGO_SIBYTE 0x150000        /* Broadcom SiByte SOCs         */ 
    205 #define I2C_ALGO_SGI    0x160000        /* SGI algorithm                */ 
     203#define I2C_ALGO_SGI    0x160000        /* SGI algorithm                */ 
    206204#define I2C_ALGO_USB    0x170000        /* USB algorithm                */ 
    207205#define I2C_ALGO_VIRT   0x180000        /* Virtual bus adapter          */ 
  • i2c/trunk/kernel/i2c.h

    r4191 r4245  
    6060union i2c_smbus_data; 
    6161 
     62 
    6263/* 
    6364 * The master routines are the ones normally used to transmit data to devices 
     
    7172/* Transfer num messages. 
    7273 */ 
    73 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num); 
     74extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg,int num); 
    7475 
    7576 
     
    143144        int (*command)(struct i2c_client *client,unsigned int cmd, void *arg); 
    144145         
    145         /* These two are used for bookkeeping & dynamic unloading of  
     146        /* These two are used for bookkeeping & dynamic unloading of 
    146147         * kernel modules. inc_use tells the driver that a client is being   
    147148         * used by another module & that it should increase its ref. counter. 
     
    196197           smbus_xfer. If set to NULL, the SMBus protocol is simulated 
    197198           using common I2C messages */ 
    198         int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[],  
     199        int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, 
    199200                           int num); 
    200201        int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,