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/spi/mpc52xx_spi.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/spi/mpc52xx_spi.c')
-rw-r--r-- | drivers/spi/mpc52xx_spi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c index 6573233bf7c9..b1a76bff775f 100644 --- a/drivers/spi/mpc52xx_spi.c +++ b/drivers/spi/mpc52xx_spi.c | |||
@@ -558,9 +558,11 @@ static const struct of_device_id mpc52xx_spi_match[] __devinitconst = { | |||
558 | MODULE_DEVICE_TABLE(of, mpc52xx_spi_match); | 558 | MODULE_DEVICE_TABLE(of, mpc52xx_spi_match); |
559 | 559 | ||
560 | static struct of_platform_driver mpc52xx_spi_of_driver = { | 560 | static struct of_platform_driver mpc52xx_spi_of_driver = { |
561 | .owner = THIS_MODULE, | 561 | .driver = { |
562 | .name = "mpc52xx-spi", | 562 | .name = "mpc52xx-spi", |
563 | .match_table = mpc52xx_spi_match, | 563 | .owner = THIS_MODULE, |
564 | .of_match_table = mpc52xx_spi_match, | ||
565 | }, | ||
564 | .probe = mpc52xx_spi_probe, | 566 | .probe = mpc52xx_spi_probe, |
565 | .remove = __exit_p(mpc52xx_spi_remove), | 567 | .remove = __exit_p(mpc52xx_spi_remove), |
566 | }; | 568 | }; |