diff options
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 68ec03152d5f..c15cfada5f13 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -318,18 +318,10 @@ static inline void omap_init_audio(void) {} | |||
318 | #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \ | 318 | #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \ |
319 | defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE) | 319 | defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE) |
320 | 320 | ||
321 | static struct omap_device_pm_latency omap_mcpdm_latency[] = { | ||
322 | { | ||
323 | .deactivate_func = omap_device_idle_hwmods, | ||
324 | .activate_func = omap_device_enable_hwmods, | ||
325 | .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, | ||
326 | }, | ||
327 | }; | ||
328 | |||
329 | static void omap_init_mcpdm(void) | 321 | static void omap_init_mcpdm(void) |
330 | { | 322 | { |
331 | struct omap_hwmod *oh; | 323 | struct omap_hwmod *oh; |
332 | struct omap_device *od; | 324 | struct platform_device *pdev; |
333 | 325 | ||
334 | oh = omap_hwmod_lookup("mcpdm"); | 326 | oh = omap_hwmod_lookup("mcpdm"); |
335 | if (!oh) { | 327 | if (!oh) { |
@@ -337,11 +329,8 @@ static void omap_init_mcpdm(void) | |||
337 | return; | 329 | return; |
338 | } | 330 | } |
339 | 331 | ||
340 | od = omap_device_build("omap-mcpdm", -1, oh, NULL, 0, | 332 | pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0, NULL, 0, 0); |
341 | omap_mcpdm_latency, | 333 | WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n"); |
342 | ARRAY_SIZE(omap_mcpdm_latency), 0); | ||
343 | if (IS_ERR(od)) | ||
344 | printk(KERN_ERR "Could not build omap_device for omap-mcpdm-dai\n"); | ||
345 | } | 334 | } |
346 | #else | 335 | #else |
347 | static inline void omap_init_mcpdm(void) {} | 336 | static inline void omap_init_mcpdm(void) {} |