diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:13:02 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:10:40 -0400 |
commit | 4018294b53d1dae026880e45f174c1cc63b5d435 (patch) | |
tree | 6db3538eaf91b653381720a6d92f4f15634a93d0 /arch/sparc/kernel/time_64.c | |
parent | 597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a (diff) |
of: Remove duplicate fields from of_platform_driver
.name, .match_table and .owner are duplicated in both of_platform_driver
and device_driver. This patch is a removes the extra copies from struct
of_platform_driver and converts all users to the device_driver members.
This patch is a pretty mechanical change. The usage model doesn't change
and if any drivers have been missed, or if anything has been fixed up
incorrectly, then it will fail with a compile time error, and the fixup
will be trivial. This patch looks big and scary because it touches so
many files, but it should be pretty safe.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Diffstat (limited to 'arch/sparc/kernel/time_64.c')
-rw-r--r-- | arch/sparc/kernel/time_64.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index 9099ca09564..21e9fcae066 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c | |||
@@ -463,10 +463,11 @@ static struct of_device_id __initdata rtc_match[] = { | |||
463 | }; | 463 | }; |
464 | 464 | ||
465 | static struct of_platform_driver rtc_driver = { | 465 | static struct of_platform_driver rtc_driver = { |
466 | .match_table = rtc_match, | ||
467 | .probe = rtc_probe, | 466 | .probe = rtc_probe, |
468 | .driver = { | 467 | .driver = { |
469 | .name = "rtc", | 468 | .name = "rtc", |
469 | .owner = THIS_MODULE, | ||
470 | .of_match_table = rtc_match, | ||
470 | }, | 471 | }, |
471 | }; | 472 | }; |
472 | 473 | ||
@@ -495,10 +496,11 @@ static struct of_device_id __initdata bq4802_match[] = { | |||
495 | }; | 496 | }; |
496 | 497 | ||
497 | static struct of_platform_driver bq4802_driver = { | 498 | static struct of_platform_driver bq4802_driver = { |
498 | .match_table = bq4802_match, | ||
499 | .probe = bq4802_probe, | 499 | .probe = bq4802_probe, |
500 | .driver = { | 500 | .driver = { |
501 | .name = "bq4802", | 501 | .name = "bq4802", |
502 | .owner = THIS_MODULE, | ||
503 | .of_match_table = bq4802_match, | ||
502 | }, | 504 | }, |
503 | }; | 505 | }; |
504 | 506 | ||
@@ -558,10 +560,11 @@ static struct of_device_id __initdata mostek_match[] = { | |||
558 | }; | 560 | }; |
559 | 561 | ||
560 | static struct of_platform_driver mostek_driver = { | 562 | static struct of_platform_driver mostek_driver = { |
561 | .match_table = mostek_match, | ||
562 | .probe = mostek_probe, | 563 | .probe = mostek_probe, |
563 | .driver = { | 564 | .driver = { |
564 | .name = "mostek", | 565 | .name = "mostek", |
566 | .owner = THIS_MODULE, | ||
567 | .of_match_table = mostek_match, | ||
565 | }, | 568 | }, |
566 | }; | 569 | }; |
567 | 570 | ||