source:
scripts/patches/linux-2.6.11-gcc4_fixes.patch@
75bc092
Last change on this file since 75bc092 was 7f65c0e, checked in by , 19 years ago | |
---|---|
|
|
File size: 10.7 KB |
-
./include/linux/i2c.h
old new 55 55 56 56 /* Transfer num messages. 57 57 */ 58 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num);58 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num); 59 59 60 60 /* 61 61 * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. … … 194 194 to NULL. If an adapter algorithm can do SMBus access, set 195 195 smbus_xfer. If set to NULL, the SMBus protocol is simulated 196 196 using common I2C messages */ 197 int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[],197 int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, 198 198 int num); 199 199 int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, 200 200 unsigned short flags, char read_write, -
./drivers/i2c/busses/i2c-iop3xx.c
old new 361 361 * master_xfer() - main read/write entry 362 362 */ 363 363 static int 364 iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[],364 iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, 365 365 int num) 366 366 { 367 367 struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; -
./drivers/i2c/i2c-core.c
old new 583 583 * ---------------------------------------------------- 584 584 */ 585 585 586 int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num)586 int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num) 587 587 { 588 588 int ret; 589 589 -
./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
old new 252 252 return rcv_len; 253 253 } 254 254 255 static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)255 static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) 256 256 { 257 257 struct ttusb *ttusb = i2c_get_adapdata(adapter); 258 258 int i = 0; -
./drivers/media/dvb/b2c2/skystar2.c
old new 293 293 return buf - start; 294 294 } 295 295 296 static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msgs[], int num)296 static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msgs, int num) 297 297 { 298 298 struct adapter *tmp = i2c_get_adapdata(adapter); 299 299 int i, ret = 0; -
./Documentation/i2c/writing-clients
old new 642 642 parameter contains the bytes the read/write, the third the length of the 643 643 buffer. Returned is the actual number of bytes read/written. 644 644 645 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],645 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, 646 646 int num); 647 647 648 648 This sends a series of messages. Each message can be a read or write, -
./include/media/saa7146.h
old new 157 157 158 158 /* from saa7146_i2c.c */ 159 159 int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate); 160 int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg msgs[], int num, int retries);160 int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg *msgs, int num, int retries); 161 161 162 162 /* from saa7146_core.c */ 163 163 extern struct list_head saa7146_devices; -
./drivers/i2c/busses/i2c-s3c2410.c
old new 483 483 * this starts an i2c transfer 484 484 */ 485 485 486 static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg msgs[], int num)486 static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int num) 487 487 { 488 488 unsigned long timeout; 489 489 int ret; … … 534 534 */ 535 535 536 536 static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, 537 struct i2c_msg msgs[], int num)537 struct i2c_msg *msgs, int num) 538 538 { 539 539 struct s3c24xx_i2c *i2c = (struct s3c24xx_i2c *)adap->algo_data; 540 540 int retry; -
./drivers/i2c/busses/i2c-mpc.c
old new 233 233 return length; 234 234 } 235 235 236 static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)236 static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 237 237 { 238 238 struct i2c_msg *pmsg; 239 239 int i; -
./drivers/i2c/busses/i2c-ibm_iic.c
old new 549 549 * Generic master transfer entrypoint. 550 550 * Returns the number of processed messages or error (<0) 551 551 */ 552 static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)552 static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 553 553 { 554 554 struct ibm_iic_private* dev = (struct ibm_iic_private*)(i2c_get_adapdata(adap)); 555 555 volatile struct iic_regs __iomem *iic = dev->vaddr; -
./drivers/i2c/busses/i2c-keywest.c
old new 399 399 */ 400 400 static int 401 401 keywest_xfer( struct i2c_adapter *adap, 402 struct i2c_msg msgs[],402 struct i2c_msg *msgs, 403 403 int num) 404 404 { 405 405 struct keywest_chan* chan = i2c_get_adapdata(adap); -
./drivers/i2c/busses/i2c-au1550.c
old new 253 253 } 254 254 255 255 static int 256 au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)256 au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) 257 257 { 258 258 struct i2c_au1550_data *adap = i2c_adap->algo_data; 259 259 struct i2c_msg *p; -
./drivers/i2c/algos/i2c-algo-pca.c
old new 178 178 } 179 179 180 180 static int pca_xfer(struct i2c_adapter *i2c_adap, 181 struct i2c_msg msgs[],181 struct i2c_msg *msgs, 182 182 int num) 183 183 { 184 184 struct i2c_algo_pca_data *adap = i2c_adap->algo_data; -
./drivers/i2c/algos/i2c-algo-pcf.c
old new 332 332 } 333 333 334 334 static int pcf_xfer(struct i2c_adapter *i2c_adap, 335 struct i2c_msg msgs[],335 struct i2c_msg *msgs, 336 336 int num) 337 337 { 338 338 struct i2c_algo_pcf_data *adap = i2c_adap->algo_data; -
./drivers/i2c/algos/i2c-algo-ite.c
old new 490 490 * condition. 491 491 */ 492 492 #if 0 493 static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)493 static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) 494 494 { 495 495 int i; 496 496 struct i2c_msg *pmsg; … … 600 600 * verify that the bus is not busy or in some unknown state. 601 601 */ 602 602 static int iic_xfer(struct i2c_adapter *i2c_adap, 603 struct i2c_msg msgs[],603 struct i2c_msg *msgs, 604 604 int num) 605 605 { 606 606 struct i2c_algo_iic_data *adap = i2c_adap->algo_data; -
./drivers/i2c/algos/i2c-algo-sgi.c
old new 131 131 return 0; 132 132 } 133 133 134 static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[],134 static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, 135 135 int num) 136 136 { 137 137 struct i2c_algo_sgi_data *adap = i2c_adap->algo_data; -
./drivers/media/video/saa7134/saa7134-i2c.c
old new 236 236 } 237 237 238 238 static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, 239 struct i2c_msg msgs[], int num)239 struct i2c_msg *msgs, int num) 240 240 { 241 241 struct saa7134_dev *dev = i2c_adap->algo_data; 242 242 enum i2c_status status; -
./drivers/media/video/bttv-i2c.c
old new 245 245 return retval; 246 246 } 247 247 248 static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)248 static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) 249 249 { 250 250 struct bttv *btv = i2c_get_adapdata(i2c_adap); 251 251 int retval = 0; -
./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c
old new 38 38 /* 39 39 * I2C master xfer function 40 40 */ 41 static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)41 static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num) 42 42 { 43 43 struct usb_dibusb *dib = i2c_get_adapdata(adap); 44 44 int i; -
./drivers/media/common/saa7146_i2c.c
old new 25 25 sent through the saa7146. have a look at the specifications p. 122 ff 26 26 to understand this. it returns the number of u32s to send, or -1 27 27 in case of an error. */ 28 static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op)28 static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, u32 *op) 29 29 { 30 30 int h1, h2; 31 31 int i, j, addr; … … 89 89 which bytes were read through the adapter and write them back to the corresponding 90 90 i2c-message. but instead, we simply write back all bytes. 91 91 fixme: this could be improved. */ 92 static int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op)92 static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, u32 *op) 93 93 { 94 94 int i, j; 95 95 int op_count = 0; … … 272 272 return 0; 273 273 } 274 274 275 int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg msgs[], int num, int retries)275 int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries) 276 276 { 277 277 int i = 0, count = 0; 278 278 u32* buffer = dev->d_i2c.cpu_addr; … … 372 372 } 373 373 374 374 /* utility functions */ 375 static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)375 static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) 376 376 { 377 377 struct saa7146_dev* dev = i2c_get_adapdata(adapter); 378 378
Note:
See TracBrowser
for help on using the repository browser.