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 /sound/sparc/dbri.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 'sound/sparc/dbri.c')
-rw-r--r-- | sound/sparc/dbri.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 1b5192eb5ae5..1557bf132e73 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -2687,8 +2687,11 @@ static const struct of_device_id dbri_match[] = { | |||
2687 | MODULE_DEVICE_TABLE(of, dbri_match); | 2687 | MODULE_DEVICE_TABLE(of, dbri_match); |
2688 | 2688 | ||
2689 | static struct of_platform_driver dbri_sbus_driver = { | 2689 | static struct of_platform_driver dbri_sbus_driver = { |
2690 | .name = "dbri", | 2690 | .driver = { |
2691 | .match_table = dbri_match, | 2691 | .name = "dbri", |
2692 | .owner = THIS_MODULE, | ||
2693 | .of_match_table = dbri_match, | ||
2694 | }, | ||
2692 | .probe = dbri_probe, | 2695 | .probe = dbri_probe, |
2693 | .remove = __devexit_p(dbri_remove), | 2696 | .remove = __devexit_p(dbri_remove), |
2694 | }; | 2697 | }; |