diff options
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 6c62af108710..4b233e8cf905 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | 25 | ||
26 | #include <plat/mcbsp.h> | 26 | #include <plat/mcbsp.h> |
27 | #include <plat/omap_device.h> | ||
28 | #include <linux/pm_runtime.h> | 27 | #include <linux/pm_runtime.h> |
29 | 28 | ||
30 | /* XXX These "sideways" includes are a sign that something is wrong */ | 29 | /* XXX These "sideways" includes are a sign that something is wrong */ |
@@ -258,19 +257,9 @@ int omap_mcbsp_dma_reg_params(unsigned int id, unsigned int stream) | |||
258 | EXPORT_SYMBOL(omap_mcbsp_dma_reg_params); | 257 | EXPORT_SYMBOL(omap_mcbsp_dma_reg_params); |
259 | 258 | ||
260 | #ifdef CONFIG_ARCH_OMAP3 | 259 | #ifdef CONFIG_ARCH_OMAP3 |
261 | static struct omap_device *find_omap_device_by_dev(struct device *dev) | ||
262 | { | ||
263 | struct platform_device *pdev = container_of(dev, | ||
264 | struct platform_device, dev); | ||
265 | return container_of(pdev, struct omap_device, pdev); | ||
266 | } | ||
267 | |||
268 | static void omap_st_on(struct omap_mcbsp *mcbsp) | 260 | static void omap_st_on(struct omap_mcbsp *mcbsp) |
269 | { | 261 | { |
270 | unsigned int w; | 262 | unsigned int w; |
271 | struct omap_device *od; | ||
272 | |||
273 | od = find_omap_device_by_dev(mcbsp->dev); | ||
274 | 263 | ||
275 | /* | 264 | /* |
276 | * Sidetone uses McBSP ICLK - which must not idle when sidetones | 265 | * Sidetone uses McBSP ICLK - which must not idle when sidetones |
@@ -292,9 +281,6 @@ static void omap_st_on(struct omap_mcbsp *mcbsp) | |||
292 | static void omap_st_off(struct omap_mcbsp *mcbsp) | 281 | static void omap_st_off(struct omap_mcbsp *mcbsp) |
293 | { | 282 | { |
294 | unsigned int w; | 283 | unsigned int w; |
295 | struct omap_device *od; | ||
296 | |||
297 | od = find_omap_device_by_dev(mcbsp->dev); | ||
298 | 284 | ||
299 | w = MCBSP_ST_READ(mcbsp, SSELCR); | 285 | w = MCBSP_ST_READ(mcbsp, SSELCR); |
300 | MCBSP_ST_WRITE(mcbsp, SSELCR, w & ~(ST_SIDETONEEN)); | 286 | MCBSP_ST_WRITE(mcbsp, SSELCR, w & ~(ST_SIDETONEEN)); |
@@ -310,9 +296,6 @@ static void omap_st_off(struct omap_mcbsp *mcbsp) | |||
310 | static void omap_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir) | 296 | static void omap_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir) |
311 | { | 297 | { |
312 | u16 val, i; | 298 | u16 val, i; |
313 | struct omap_device *od; | ||
314 | |||
315 | od = find_omap_device_by_dev(mcbsp->dev); | ||
316 | 299 | ||
317 | val = MCBSP_ST_READ(mcbsp, SSELCR); | 300 | val = MCBSP_ST_READ(mcbsp, SSELCR); |
318 | 301 | ||
@@ -340,9 +323,6 @@ static void omap_st_chgain(struct omap_mcbsp *mcbsp) | |||
340 | { | 323 | { |
341 | u16 w; | 324 | u16 w; |
342 | struct omap_mcbsp_st_data *st_data = mcbsp->st_data; | 325 | struct omap_mcbsp_st_data *st_data = mcbsp->st_data; |
343 | struct omap_device *od; | ||
344 | |||
345 | od = find_omap_device_by_dev(mcbsp->dev); | ||
346 | 326 | ||
347 | w = MCBSP_ST_READ(mcbsp, SSELCR); | 327 | w = MCBSP_ST_READ(mcbsp, SSELCR); |
348 | 328 | ||
@@ -685,9 +665,6 @@ EXPORT_SYMBOL(omap_mcbsp_get_dma_op_mode); | |||
685 | 665 | ||
686 | static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) | 666 | static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) |
687 | { | 667 | { |
688 | struct omap_device *od; | ||
689 | |||
690 | od = find_omap_device_by_dev(mcbsp->dev); | ||
691 | /* | 668 | /* |
692 | * Enable wakup behavior, smart idle and all wakeups | 669 | * Enable wakup behavior, smart idle and all wakeups |
693 | * REVISIT: some wakeups may be unnecessary | 670 | * REVISIT: some wakeups may be unnecessary |
@@ -699,10 +676,6 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) | |||
699 | 676 | ||
700 | static inline void omap34xx_mcbsp_free(struct omap_mcbsp *mcbsp) | 677 | static inline void omap34xx_mcbsp_free(struct omap_mcbsp *mcbsp) |
701 | { | 678 | { |
702 | struct omap_device *od; | ||
703 | |||
704 | od = find_omap_device_by_dev(mcbsp->dev); | ||
705 | |||
706 | /* | 679 | /* |
707 | * Disable wakup behavior, smart idle and all wakeups | 680 | * Disable wakup behavior, smart idle and all wakeups |
708 | */ | 681 | */ |