of/device: Replace struct of_device with struct platform_device

[linux-2.6-block.git] / drivers / pcmcia / m8xx_pcmcia.c

diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 1a648b90b634890512ffb95560c1944d5d7a214a..84a70a59ef95fdf16dba44962d871abedad6d0af 100644 (file)
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1150,14 +1150,14 @@ static struct pccard_operations m8xx_services = {
        .set_mem_map = m8xx_set_mem_map,
 };
 
-static int __init m8xx_probe(struct of_device *ofdev,
+static int __init m8xx_probe(struct platform_device *ofdev,
                             const struct of_device_id *match)
 {
        struct pcmcia_win *w;
        unsigned int i, m, hwirq;
        pcmconf8xx_t *pcmcia;
        int status;
-       struct device_node *np = ofdev->node;
+       struct device_node *np = ofdev->dev.of_node;
 
        pcmcia_info("%s\n", version);
 
@@ -1250,7 +1250,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
        return 0;
 }
 
-static int m8xx_remove(struct of_device *ofdev)
+static int m8xx_remove(struct platform_device *ofdev)
 {
        u32 m, i;
        struct pcmcia_win *w;
@@ -1301,7 +1301,7 @@ static struct of_platform_driver m8xx_pcmcia_driver = {
        .driver = {
                .name = driver_name,
                .owner = THIS_MODULE,
-               .match_table = m8xx_pcmcia_match,
+               .of_match_table = m8xx_pcmcia_match,
        },
        .probe = m8xx_probe,
        .remove = m8xx_remove,