diff options
author | Andres Salomon <dilinger@queued.net> | 2011-02-17 22:07:25 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 05:41:55 -0400 |
commit | 65e523595a31813c0f20ffd249792c60e253438e (patch) | |
tree | 595f1db4bafe62d7d96760d45ea6d42e59a21256 /drivers/mfd/timberdale.c | |
parent | 40e03f571b2e63827f2afb90ea9aa459612c29e3 (diff) |
mfd: Rename platform_data field of mfd_cell to mfd_data
Rename the platform_data variable to imply a distinction between
common platform_data driver usage (typically accessed via
pdev->dev.platform_data) and the way MFD passes data down to
clients (using a wrapper named mfd_get_data).
All clients have already been changed to use the wrapper function,
so this can be a quick single-commit change that only touches things
in drivers/mfd.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/timberdale.c')
-rw-r--r-- | drivers/mfd/timberdale.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index 6353921c1729..94c6c8afad12 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c | |||
@@ -384,7 +384,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { | |||
384 | .name = "timb-dma", | 384 | .name = "timb-dma", |
385 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 385 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
386 | .resources = timberdale_dma_resources, | 386 | .resources = timberdale_dma_resources, |
387 | .platform_data = &timb_dma_platform_data, | 387 | .mfd_data = &timb_dma_platform_data, |
388 | }, | 388 | }, |
389 | { | 389 | { |
390 | .name = "timb-uart", | 390 | .name = "timb-uart", |
@@ -395,37 +395,37 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { | |||
395 | .name = "xiic-i2c", | 395 | .name = "xiic-i2c", |
396 | .num_resources = ARRAY_SIZE(timberdale_xiic_resources), | 396 | .num_resources = ARRAY_SIZE(timberdale_xiic_resources), |
397 | .resources = timberdale_xiic_resources, | 397 | .resources = timberdale_xiic_resources, |
398 | .platform_data = &timberdale_xiic_platform_data, | 398 | .mfd_data = &timberdale_xiic_platform_data, |
399 | }, | 399 | }, |
400 | { | 400 | { |
401 | .name = "timb-gpio", | 401 | .name = "timb-gpio", |
402 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), | 402 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), |
403 | .resources = timberdale_gpio_resources, | 403 | .resources = timberdale_gpio_resources, |
404 | .platform_data = &timberdale_gpio_platform_data, | 404 | .mfd_data = &timberdale_gpio_platform_data, |
405 | }, | 405 | }, |
406 | { | 406 | { |
407 | .name = "timb-video", | 407 | .name = "timb-video", |
408 | .num_resources = ARRAY_SIZE(timberdale_video_resources), | 408 | .num_resources = ARRAY_SIZE(timberdale_video_resources), |
409 | .resources = timberdale_video_resources, | 409 | .resources = timberdale_video_resources, |
410 | .platform_data = &timberdale_video_platform_data, | 410 | .mfd_data = &timberdale_video_platform_data, |
411 | }, | 411 | }, |
412 | { | 412 | { |
413 | .name = "timb-radio", | 413 | .name = "timb-radio", |
414 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), | 414 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), |
415 | .resources = timberdale_radio_resources, | 415 | .resources = timberdale_radio_resources, |
416 | .platform_data = &timberdale_radio_platform_data, | 416 | .mfd_data = &timberdale_radio_platform_data, |
417 | }, | 417 | }, |
418 | { | 418 | { |
419 | .name = "xilinx_spi", | 419 | .name = "xilinx_spi", |
420 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), | 420 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), |
421 | .resources = timberdale_spi_resources, | 421 | .resources = timberdale_spi_resources, |
422 | .platform_data = &timberdale_xspi_platform_data, | 422 | .mfd_data = &timberdale_xspi_platform_data, |
423 | }, | 423 | }, |
424 | { | 424 | { |
425 | .name = "ks8842", | 425 | .name = "ks8842", |
426 | .num_resources = ARRAY_SIZE(timberdale_eth_resources), | 426 | .num_resources = ARRAY_SIZE(timberdale_eth_resources), |
427 | .resources = timberdale_eth_resources, | 427 | .resources = timberdale_eth_resources, |
428 | .platform_data = &timberdale_ks8842_platform_data, | 428 | .mfd_data = &timberdale_ks8842_platform_data, |
429 | }, | 429 | }, |
430 | }; | 430 | }; |
431 | 431 | ||
@@ -434,7 +434,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { | |||
434 | .name = "timb-dma", | 434 | .name = "timb-dma", |
435 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 435 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
436 | .resources = timberdale_dma_resources, | 436 | .resources = timberdale_dma_resources, |
437 | .platform_data = &timb_dma_platform_data, | 437 | .mfd_data = &timb_dma_platform_data, |
438 | }, | 438 | }, |
439 | { | 439 | { |
440 | .name = "timb-uart", | 440 | .name = "timb-uart", |
@@ -450,13 +450,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { | |||
450 | .name = "xiic-i2c", | 450 | .name = "xiic-i2c", |
451 | .num_resources = ARRAY_SIZE(timberdale_xiic_resources), | 451 | .num_resources = ARRAY_SIZE(timberdale_xiic_resources), |
452 | .resources = timberdale_xiic_resources, | 452 | .resources = timberdale_xiic_resources, |
453 | .platform_data = &timberdale_xiic_platform_data, | 453 | .mfd_data = &timberdale_xiic_platform_data, |
454 | }, | 454 | }, |
455 | { | 455 | { |
456 | .name = "timb-gpio", | 456 | .name = "timb-gpio", |
457 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), | 457 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), |
458 | .resources = timberdale_gpio_resources, | 458 | .resources = timberdale_gpio_resources, |
459 | .platform_data = &timberdale_gpio_platform_data, | 459 | .mfd_data = &timberdale_gpio_platform_data, |
460 | }, | 460 | }, |
461 | { | 461 | { |
462 | .name = "timb-mlogicore", | 462 | .name = "timb-mlogicore", |
@@ -467,25 +467,25 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { | |||
467 | .name = "timb-video", | 467 | .name = "timb-video", |
468 | .num_resources = ARRAY_SIZE(timberdale_video_resources), | 468 | .num_resources = ARRAY_SIZE(timberdale_video_resources), |
469 | .resources = timberdale_video_resources, | 469 | .resources = timberdale_video_resources, |
470 | .platform_data = &timberdale_video_platform_data, | 470 | .mfd_data = &timberdale_video_platform_data, |
471 | }, | 471 | }, |
472 | { | 472 | { |
473 | .name = "timb-radio", | 473 | .name = "timb-radio", |
474 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), | 474 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), |
475 | .resources = timberdale_radio_resources, | 475 | .resources = timberdale_radio_resources, |
476 | .platform_data = &timberdale_radio_platform_data, | 476 | .mfd_data = &timberdale_radio_platform_data, |
477 | }, | 477 | }, |
478 | { | 478 | { |
479 | .name = "xilinx_spi", | 479 | .name = "xilinx_spi", |
480 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), | 480 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), |
481 | .resources = timberdale_spi_resources, | 481 | .resources = timberdale_spi_resources, |
482 | .platform_data = &timberdale_xspi_platform_data, | 482 | .mfd_data = &timberdale_xspi_platform_data, |
483 | }, | 483 | }, |
484 | { | 484 | { |
485 | .name = "ks8842", | 485 | .name = "ks8842", |
486 | .num_resources = ARRAY_SIZE(timberdale_eth_resources), | 486 | .num_resources = ARRAY_SIZE(timberdale_eth_resources), |
487 | .resources = timberdale_eth_resources, | 487 | .resources = timberdale_eth_resources, |
488 | .platform_data = &timberdale_ks8842_platform_data, | 488 | .mfd_data = &timberdale_ks8842_platform_data, |
489 | }, | 489 | }, |
490 | }; | 490 | }; |
491 | 491 | ||
@@ -494,7 +494,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { | |||
494 | .name = "timb-dma", | 494 | .name = "timb-dma", |
495 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 495 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
496 | .resources = timberdale_dma_resources, | 496 | .resources = timberdale_dma_resources, |
497 | .platform_data = &timb_dma_platform_data, | 497 | .mfd_data = &timb_dma_platform_data, |
498 | }, | 498 | }, |
499 | { | 499 | { |
500 | .name = "timb-uart", | 500 | .name = "timb-uart", |
@@ -505,31 +505,31 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { | |||
505 | .name = "xiic-i2c", | 505 | .name = "xiic-i2c", |
506 | .num_resources = ARRAY_SIZE(timberdale_xiic_resources), | 506 | .num_resources = ARRAY_SIZE(timberdale_xiic_resources), |
507 | .resources = timberdale_xiic_resources, | 507 | .resources = timberdale_xiic_resources, |
508 | .platform_data = &timberdale_xiic_platform_data, | 508 | .mfd_data = &timberdale_xiic_platform_data, |
509 | }, | 509 | }, |
510 | { | 510 | { |
511 | .name = "timb-gpio", | 511 | .name = "timb-gpio", |
512 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), | 512 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), |
513 | .resources = timberdale_gpio_resources, | 513 | .resources = timberdale_gpio_resources, |
514 | .platform_data = &timberdale_gpio_platform_data, | 514 | .mfd_data = &timberdale_gpio_platform_data, |
515 | }, | 515 | }, |
516 | { | 516 | { |
517 | .name = "timb-video", | 517 | .name = "timb-video", |
518 | .num_resources = ARRAY_SIZE(timberdale_video_resources), | 518 | .num_resources = ARRAY_SIZE(timberdale_video_resources), |
519 | .resources = timberdale_video_resources, | 519 | .resources = timberdale_video_resources, |
520 | .platform_data = &timberdale_video_platform_data, | 520 | .mfd_data = &timberdale_video_platform_data, |
521 | }, | 521 | }, |
522 | { | 522 | { |
523 | .name = "timb-radio", | 523 | .name = "timb-radio", |
524 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), | 524 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), |
525 | .resources = timberdale_radio_resources, | 525 | .resources = timberdale_radio_resources, |
526 | .platform_data = &timberdale_radio_platform_data, | 526 | .mfd_data = &timberdale_radio_platform_data, |
527 | }, | 527 | }, |
528 | { | 528 | { |
529 | .name = "xilinx_spi", | 529 | .name = "xilinx_spi", |
530 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), | 530 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), |
531 | .resources = timberdale_spi_resources, | 531 | .resources = timberdale_spi_resources, |
532 | .platform_data = &timberdale_xspi_platform_data, | 532 | .mfd_data = &timberdale_xspi_platform_data, |
533 | }, | 533 | }, |
534 | }; | 534 | }; |
535 | 535 | ||
@@ -538,7 +538,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { | |||
538 | .name = "timb-dma", | 538 | .name = "timb-dma", |
539 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 539 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
540 | .resources = timberdale_dma_resources, | 540 | .resources = timberdale_dma_resources, |
541 | .platform_data = &timb_dma_platform_data, | 541 | .mfd_data = &timb_dma_platform_data, |
542 | }, | 542 | }, |
543 | { | 543 | { |
544 | .name = "timb-uart", | 544 | .name = "timb-uart", |
@@ -549,37 +549,37 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { | |||
549 | .name = "ocores-i2c", | 549 | .name = "ocores-i2c", |
550 | .num_resources = ARRAY_SIZE(timberdale_ocores_resources), | 550 | .num_resources = ARRAY_SIZE(timberdale_ocores_resources), |
551 | .resources = timberdale_ocores_resources, | 551 | .resources = timberdale_ocores_resources, |
552 | .platform_data = &timberdale_ocores_platform_data, | 552 | .mfd_data = &timberdale_ocores_platform_data, |
553 | }, | 553 | }, |
554 | { | 554 | { |
555 | .name = "timb-gpio", | 555 | .name = "timb-gpio", |
556 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), | 556 | .num_resources = ARRAY_SIZE(timberdale_gpio_resources), |
557 | .resources = timberdale_gpio_resources, | 557 | .resources = timberdale_gpio_resources, |
558 | .platform_data = &timberdale_gpio_platform_data, | 558 | .mfd_data = &timberdale_gpio_platform_data, |
559 | }, | 559 | }, |
560 | { | 560 | { |
561 | .name = "timb-video", | 561 | .name = "timb-video", |
562 | .num_resources = ARRAY_SIZE(timberdale_video_resources), | 562 | .num_resources = ARRAY_SIZE(timberdale_video_resources), |
563 | .resources = timberdale_video_resources, | 563 | .resources = timberdale_video_resources, |
564 | .platform_data = &timberdale_video_platform_data, | 564 | .mfd_data = &timberdale_video_platform_data, |
565 | }, | 565 | }, |
566 | { | 566 | { |
567 | .name = "timb-radio", | 567 | .name = "timb-radio", |
568 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), | 568 | .num_resources = ARRAY_SIZE(timberdale_radio_resources), |
569 | .resources = timberdale_radio_resources, | 569 | .resources = timberdale_radio_resources, |
570 | .platform_data = &timberdale_radio_platform_data, | 570 | .mfd_data = &timberdale_radio_platform_data, |
571 | }, | 571 | }, |
572 | { | 572 | { |
573 | .name = "xilinx_spi", | 573 | .name = "xilinx_spi", |
574 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), | 574 | .num_resources = ARRAY_SIZE(timberdale_spi_resources), |
575 | .resources = timberdale_spi_resources, | 575 | .resources = timberdale_spi_resources, |
576 | .platform_data = &timberdale_xspi_platform_data, | 576 | .mfd_data = &timberdale_xspi_platform_data, |
577 | }, | 577 | }, |
578 | { | 578 | { |
579 | .name = "ks8842", | 579 | .name = "ks8842", |
580 | .num_resources = ARRAY_SIZE(timberdale_eth_resources), | 580 | .num_resources = ARRAY_SIZE(timberdale_eth_resources), |
581 | .resources = timberdale_eth_resources, | 581 | .resources = timberdale_eth_resources, |
582 | .platform_data = &timberdale_ks8842_platform_data, | 582 | .mfd_data = &timberdale_ks8842_platform_data, |
583 | }, | 583 | }, |
584 | }; | 584 | }; |
585 | 585 | ||