Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[mv-sheeva.git] / drivers / input / serio / xilinx_ps2.c

diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index f84f8e32e3f1789fac1655752eeb051b3139cb93..bb14449fb0223d784ab233690df5932208965b88 100644 (file)
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -232,7 +232,7 @@ static void sxps2_close(struct serio *pserio)
  * It returns 0, if the driver is bound to the PS/2 device, or a negative
  * value if there is an error.
  */
-static int __devinit xps2_of_probe(struct of_device *ofdev,
+static int __devinit xps2_of_probe(struct platform_device *ofdev,
                                   const struct of_device_id *match)
 {
        struct resource r_irq; /* Interrupt resources */
@@ -244,17 +244,17 @@ static int __devinit xps2_of_probe(struct of_device *ofdev,
        int error;
 
        dev_info(dev, "Device Tree Probing \'%s\'\n",
-                       ofdev->node->name);
+                       ofdev->dev.of_node->name);
 
        /* Get iospace for the device */
-       error = of_address_to_resource(ofdev->node, 0, &r_mem);
+       error = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem);
        if (error) {
                dev_err(dev, "invalid address\n");
                return error;
        }
 
        /* Get IRQ for the device */
-       if (of_irq_to_resource(ofdev->node, 0, &r_irq) == NO_IRQ) {
+       if (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) == NO_IRQ) {
                dev_err(dev, "no IRQ found\n");
                return -ENODEV;
        }
@@ -332,7 +332,7 @@ failed1:
  * if the driver module is being unloaded. It frees any resources allocated to
  * the device.
  */
-static int __devexit xps2_of_remove(struct of_device *of_dev)
+static int __devexit xps2_of_remove(struct platform_device *of_dev)
 {
        struct device *dev = &of_dev->dev;
        struct xps2data *drvdata = dev_get_drvdata(dev);
@@ -342,7 +342,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev)
        iounmap(drvdata->base_address);
 
        /* Get iospace of the device */
-       if (of_address_to_resource(of_dev->node, 0, &r_mem))
+       if (of_address_to_resource(of_dev->dev.of_node, 0, &r_mem))
                dev_err(dev, "invalid address\n");
        else
                release_mem_region(r_mem.start, resource_size(&r_mem));
@@ -362,8 +362,11 @@ static const struct of_device_id xps2_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, xps2_of_match);
 
 static struct of_platform_driver xps2_of_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = xps2_of_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = xps2_of_match,
+       },
        .probe          = xps2_of_probe,
        .remove         = __devexit_p(xps2_of_remove),
 };