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/pci_sabre.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/pci_sabre.c')
-rw-r--r-- | arch/sparc/kernel/pci_sabre.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c index 5048498daade..6dad8e3b7506 100644 --- a/arch/sparc/kernel/pci_sabre.c +++ b/arch/sparc/kernel/pci_sabre.c | |||
@@ -596,8 +596,11 @@ static struct of_device_id __initdata sabre_match[] = { | |||
596 | }; | 596 | }; |
597 | 597 | ||
598 | static struct of_platform_driver sabre_driver = { | 598 | static struct of_platform_driver sabre_driver = { |
599 | .name = DRIVER_NAME, | 599 | .driver = { |
600 | .match_table = sabre_match, | 600 | .name = DRIVER_NAME, |
601 | .owner = THIS_MODULE, | ||
602 | .of_match_table = sabre_match, | ||
603 | }, | ||
601 | .probe = sabre_probe, | 604 | .probe = sabre_probe, |
602 | }; | 605 | }; |
603 | 606 | ||