diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-08-06 11:25:50 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-08-06 11:25:50 -0400 |
commit | 2dc11581376829303b98eadb2de253bee065a56a (patch) | |
tree | dbce62559c822cd720d1819a50c488bfecdfa945 /drivers/hwmon | |
parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) |
of/device: Replace struct of_device with struct platform_device
of_device is just an alias for platform_device, so remove it entirely. Also
replace to_of_device() with to_platform_device() and update comment blocks.
This patch was initially generated from the following semantic patch, and then
edited by hand to pick up the bits that coccinelle didn't catch.
@@
@@
-struct of_device
+struct platform_device
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/ams/ams.h | 2 | ||||
-rw-r--r-- | drivers/hwmon/ultra45_env.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h index b28d7e27a031..90f094d45450 100644 --- a/drivers/hwmon/ams/ams.h +++ b/drivers/hwmon/ams/ams.h | |||
@@ -23,7 +23,7 @@ struct ams { | |||
23 | 23 | ||
24 | /* General properties */ | 24 | /* General properties */ |
25 | struct device_node *of_node; | 25 | struct device_node *of_node; |
26 | struct of_device *of_dev; | 26 | struct platform_device *of_dev; |
27 | char has_device; | 27 | char has_device; |
28 | char vflag; | 28 | char vflag; |
29 | u32 orient1; | 29 | u32 orient1; |
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c index 89643261ccdb..d863e13a50b8 100644 --- a/drivers/hwmon/ultra45_env.c +++ b/drivers/hwmon/ultra45_env.c | |||
@@ -234,7 +234,7 @@ static const struct attribute_group env_group = { | |||
234 | .attrs = env_attributes, | 234 | .attrs = env_attributes, |
235 | }; | 235 | }; |
236 | 236 | ||
237 | static int __devinit env_probe(struct of_device *op, | 237 | static int __devinit env_probe(struct platform_device *op, |
238 | const struct of_device_id *match) | 238 | const struct of_device_id *match) |
239 | { | 239 | { |
240 | struct env *p = kzalloc(sizeof(*p), GFP_KERNEL); | 240 | struct env *p = kzalloc(sizeof(*p), GFP_KERNEL); |
@@ -276,7 +276,7 @@ out_free: | |||
276 | goto out; | 276 | goto out; |
277 | } | 277 | } |
278 | 278 | ||
279 | static int __devexit env_remove(struct of_device *op) | 279 | static int __devexit env_remove(struct platform_device *op) |
280 | { | 280 | { |
281 | struct env *p = dev_get_drvdata(&op->dev); | 281 | struct env *p = dev_get_drvdata(&op->dev); |
282 | 282 | ||