Changeset 3995
- Timestamp:
- 08/14/05 11:43:15 (3 years ago)
- Files:
-
- i2c/trunk/kernel/i2c-proc.c (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
i2c/trunk/kernel/i2c-proc.c
r3940 r3995 41 41 #endif 42 42 43 static int i2c_parse_reals(int *nrels, void*buffer, int bufsize,43 static int i2c_parse_reals(int *nrels, char *buffer, int bufsize, 44 44 long *results, int magnitude); 45 static int i2c_write_reals(int nrels, void*buffer, size_t *bufsize,45 static int i2c_write_reals(int nrels, char *buffer, size_t *bufsize, 46 46 long *results, int magnitude); 47 47 static int i2c_proc_chips(ctl_table * ctl, int write, … … 243 243 return -EFAULT; 244 244 curbufsize += buflen; 245 (char *)buffer += buflen;245 buffer += buflen; 246 246 } 247 247 *lenp = curbufsize; … … 274 274 i2c_chips_data))) 275 275 return -EFAULT; 276 (char *) oldval += 277 sizeof(struct i2c_chips_data); 276 oldval += sizeof(struct i2c_chips_data); 278 277 nrels++; 279 278 } … … 412 411 hidden bugs in it, even leading to crashes and things! 413 412 */ 414 static int i2c_parse_reals(int *nrels, void*buffer, int bufsize,413 static int i2c_parse_reals(int *nrels, char *buffer, int bufsize, 415 414 long *results, int magnitude) 416 415 { … … 426 425 /* Skip spaces at the start */ 427 426 while (bufsize && 428 !((ret=get_user(nextchar, (char *)buffer))) &&427 !((ret=get_user(nextchar, buffer))) && 429 428 isspace((int) nextchar)) { 430 429 bufsize--; 431 ((char *) buffer)++;430 buffer++; 432 431 } 433 432 … … 444 443 445 444 /* Check for a minus */ 446 if (!((ret=get_user(nextchar, (char *)buffer)))445 if (!((ret=get_user(nextchar, buffer))) 447 446 && (nextchar == '-')) { 448 447 min = 1; 449 448 bufsize--; 450 ((char *) buffer)++;449 buffer++; 451 450 } 452 451 if (ret) … … 455 454 /* Digits before a decimal dot */ 456 455 while (bufsize && 457 !((ret=get_user(nextchar, (char *)buffer))) &&456 !((ret=get_user(nextchar, buffer))) && 458 457 isdigit((int) nextchar)) { 459 458 res = res * 10 + nextchar - '0'; 460 459 bufsize--; 461 ((char *) buffer)++;460 buffer++; 462 461 } 463 462 if (ret) … … 473 472 /* Skip the dot */ 474 473 bufsize--; 475 ((char *) buffer)++;474 buffer++; 476 475 477 476 /* Read digits while they are significant */ 478 477 while (bufsize && (mag > 0) && 479 !((ret=get_user(nextchar, (char *)buffer))) &&478 !((ret=get_user(nextchar, buffer))) && 480 479 isdigit((int) nextchar)) { 481 480 res = res * 10 + nextchar - '0'; 482 481 mag--; 483 482 bufsize--; 484 ((char *) buffer)++;483 buffer++; 485 484 } 486 485 if (ret) … … 495 494 /* Skip everything until we hit whitespace */ 496 495 while (bufsize && 497 !((ret=get_user(nextchar, (char *)buffer))) &&496 !((ret=get_user(nextchar, buffer))) && 498 497 !isspace((int) nextchar)) { 499 498 bufsize--; 500 ((char *) buffer)++;499 buffer++; 501 500 } 502 501 if (ret) … … 513 512 } 514 513 515 static int i2c_write_reals(int nrels, void*buffer, size_t *bufsize,514 static int i2c_write_reals(int nrels, char *buffer, size_t *bufsize, 516 515 long *results, int magnitude) 517 516 { … … 527 526 528 527 if (nr != 0) { 529 if(put_user(' ', (char *)buffer))528 if(put_user(' ', buffer)) 530 529 return -EFAULT; 531 530 curbufsize++; 532 ((char *) buffer)++;531 buffer++; 533 532 } 534 533 … … 571 570 return -EFAULT; 572 571 curbufsize += buflen; 573 (char *)buffer += buflen;572 buffer += buflen; 574 573 575 574 nr++; 576 575 } 577 576 if (curbufsize < *bufsize) { 578 if(put_user('\n', (char *)buffer))577 if(put_user('\n', buffer)) 579 578 return -EFAULT; 580 579 curbufsize++;
