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/hwmon/ultra45_env.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/hwmon/ultra45_env.c')
-rw-r--r-- | drivers/hwmon/ultra45_env.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c index 68e90abeba96..5da5942cf970 100644 --- a/drivers/hwmon/ultra45_env.c +++ b/drivers/hwmon/ultra45_env.c | |||
@@ -300,8 +300,11 @@ static const struct of_device_id env_match[] = { | |||
300 | MODULE_DEVICE_TABLE(of, env_match); | 300 | MODULE_DEVICE_TABLE(of, env_match); |
301 | 301 | ||
302 | static struct of_platform_driver env_driver = { | 302 | static struct of_platform_driver env_driver = { |
303 | .name = "ultra45_env", | 303 | .driver = { |
304 | .match_table = env_match, | 304 | .name = "ultra45_env", |
305 | .owner = THIS_MODULE, | ||
306 | .of_match_table = env_match, | ||
307 | }, | ||
305 | .probe = env_probe, | 308 | .probe = env_probe, |
306 | .remove = __devexit_p(env_remove), | 309 | .remove = __devexit_p(env_remove), |
307 | }; | 310 | }; |