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/pcmcia/electra_cf.c | |
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/pcmcia/electra_cf.c')
-rw-r--r-- | drivers/pcmcia/electra_cf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index f94d8281cfb0..546d3024b6f0 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c | |||
@@ -44,7 +44,7 @@ struct electra_cf_socket { | |||
44 | unsigned present:1; | 44 | unsigned present:1; |
45 | unsigned active:1; | 45 | unsigned active:1; |
46 | 46 | ||
47 | struct of_device *ofdev; | 47 | struct platform_device *ofdev; |
48 | unsigned long mem_phys; | 48 | unsigned long mem_phys; |
49 | void __iomem * mem_base; | 49 | void __iomem * mem_base; |
50 | unsigned long mem_size; | 50 | unsigned long mem_size; |
@@ -181,7 +181,7 @@ static struct pccard_operations electra_cf_ops = { | |||
181 | .set_mem_map = electra_cf_set_mem_map, | 181 | .set_mem_map = electra_cf_set_mem_map, |
182 | }; | 182 | }; |
183 | 183 | ||
184 | static int __devinit electra_cf_probe(struct of_device *ofdev, | 184 | static int __devinit electra_cf_probe(struct platform_device *ofdev, |
185 | const struct of_device_id *match) | 185 | const struct of_device_id *match) |
186 | { | 186 | { |
187 | struct device *device = &ofdev->dev; | 187 | struct device *device = &ofdev->dev; |
@@ -325,7 +325,7 @@ fail1: | |||
325 | 325 | ||
326 | } | 326 | } |
327 | 327 | ||
328 | static int __devexit electra_cf_remove(struct of_device *ofdev) | 328 | static int __devexit electra_cf_remove(struct platform_device *ofdev) |
329 | { | 329 | { |
330 | struct device *device = &ofdev->dev; | 330 | struct device *device = &ofdev->dev; |
331 | struct electra_cf_socket *cf; | 331 | struct electra_cf_socket *cf; |