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 /drivers/video/cg6.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 'drivers/video/cg6.c')
-rw-r--r-- | drivers/video/cg6.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 7f59b0fe5dc2..480d761a27a8 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
@@ -856,8 +856,11 @@ static const struct of_device_id cg6_match[] = { | |||
856 | MODULE_DEVICE_TABLE(of, cg6_match); | 856 | MODULE_DEVICE_TABLE(of, cg6_match); |
857 | 857 | ||
858 | static struct of_platform_driver cg6_driver = { | 858 | static struct of_platform_driver cg6_driver = { |
859 | .name = "cg6", | 859 | .driver = { |
860 | .match_table = cg6_match, | 860 | .name = "cg6", |
861 | .owner = THIS_MODULE, | ||
862 | .of_match_table = cg6_match, | ||
863 | }, | ||
861 | .probe = cg6_probe, | 864 | .probe = cg6_probe, |
862 | .remove = __devexit_p(cg6_remove), | 865 | .remove = __devexit_p(cg6_remove), |
863 | }; | 866 | }; |