1 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
index c9ff0e79703d..ae8cb3fb1830 100644
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@@ -228,7 +228,7 @@ static u32 configure_dma_errata(void)
 /* One time initializations */
 static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
 {
-        struct omap_device                      *od;
+        struct platform_device                  *pdev;
         struct omap_system_dma_plat_info        *p;
         struct resource                         *mem;
         char                                    *name = "omap_dma_system";
@@ -258,23 +258,23 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
 
         p->errata               = configure_dma_errata();
 
-        od = omap_device_build(name, 0, oh, p, sizeof(*p),
+        pdev = omap_device_build(name, 0, oh, p, sizeof(*p),
                         omap2_dma_latency, ARRAY_SIZE(omap2_dma_latency), 0);
         kfree(p);
-        if (IS_ERR(od)) {
+        if (IS_ERR(pdev)) {
                 pr_err("%s: Can't build omap_device for %s:%s.\n",
                         __func__, name, oh->name);
-                return PTR_ERR(od);
+                return PTR_ERR(pdev);
         }
 
-        mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0);
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!mem) {
-                dev_err(&od->pdev.dev, "%s: no mem resource\n", __func__);
+                dev_err(&pdev->dev, "%s: no mem resource\n", __func__);
                 return -EINVAL;
         }
         dma_base = ioremap(mem->start, resource_size(mem));
         if (!dma_base) {
-                dev_err(&od->pdev.dev, "%s: ioremap fail\n", __func__);
+                dev_err(&pdev->dev, "%s: ioremap fail\n", __func__);
                 return -ENOMEM;
         }
 
@@ -283,7 +283,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
                                         (d->lch_count), GFP_KERNEL);
 
         if (!d->chan) {
-                dev_err(&od->pdev.dev, "%s: kzalloc fail\n", __func__);
+                dev_err(&pdev->dev, "%s: kzalloc fail\n", __func__);
                 return -ENOMEM;
         }
         return 0;