OMAP: omap_device: when building return platform_device instead of omap_device

All of the device init and device driver interaction with omap_device
is done using platform_device pointers.  To make this more explicit,
have omap_device return a platform_device pointer instead of an
omap_device pointer.

All current users of the omap_device pointer were only using it to get
at the platform_device pointer or struct device pointer, so fixing all
of the users was trivial.

This also makes it more difficult for device init code to directly
access members of struct omap_device, and allows for easier changing
of omap_device internals.

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 4a6ef6ab8458..7a42f32bd87d 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -116,7 +116,7 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
         char *name = "omap-mcbsp";
         struct omap_hwmod *oh_device[2];
         struct omap_mcbsp_platform_data *pdata = NULL;
-        struct omap_device *od;
+        struct platform_device *pdev;
 
         sscanf(oh->name, "mcbsp%d", &id);
 
@@ -144,14 +144,14 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
                 (struct omap_mcbsp_dev_attr *)(oh->dev_attr))->sidetone);
                 count++;
         }
-        od = omap_device_build_ss(name, id, oh_device, count, pdata,
+        pdev = omap_device_build_ss(name, id, oh_device, count, pdata,
                                 sizeof(*pdata), omap2_mcbsp_latency,
                                 ARRAY_SIZE(omap2_mcbsp_latency), false);
         kfree(pdata);
-        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);
         }
         omap_mcbsp_count++;
         return 0;