Commit 915353cf authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Tony Lindgren

Code clean-up for include/asm-arm/arch-omap/omap-alsa.h

Removed lots of whitespaces and a few errors and
warnings reported by checkpatch.pl.
Signed-off-by: default avatarEduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9fef4ae1
...@@ -49,15 +49,23 @@ ...@@ -49,15 +49,23 @@
* Debug functions * Debug functions
*/ */
#undef DEBUG #undef DEBUG
//#define DEBUG /* #define DEBUG */
#define ERR(ARGS...) printk(KERN_ERR "{%s}-ERROR: ", __FUNCTION__);printk(ARGS); #define ERR(ARGS...) \
do { \
printk(KERN_ERR "{%s}-ERROR: ", __func__); \
printk(ARGS); \
} while (0)
#ifdef DEBUG #ifdef DEBUG
#define DPRINTK(ARGS...) printk(KERN_INFO "<%s>: ",__FUNCTION__);printk(ARGS) #define DPRINTK(ARGS...) \
#define ADEBUG() printk("XXX Alsa debug f:%s, l:%d\n", __FUNCTION__, __LINE__) do { \
#define FN_IN printk(KERN_INFO "[%s]: start\n", __FUNCTION__) printk(KERN_INFO "<%s>: ", __func__); \
#define FN_OUT(n) printk(KERN_INFO "[%s]: end(%u)\n",__FUNCTION__, n) printk(ARGS); \
} while (0)
#define ADEBUG() printk("XXX Alsa debug f:%s, l:%d\n", __func__, __LINE__)
#define FN_IN printk(KERN_INFO "[%s]: start\n", __func__)
#define FN_OUT(n) printk(KERN_INFO "[%s]: end(%u)\n", __func__, n)
#else #else
#define DPRINTK(ARGS...) /* nop */ #define DPRINTK(ARGS...) /* nop */
#define ADEBUG() /* nop */ #define ADEBUG() /* nop */
...@@ -81,12 +89,12 @@ struct audio_stream { ...@@ -81,12 +89,12 @@ struct audio_stream {
char dma_q_count; /* DMA Channel Q Count */ char dma_q_count; /* DMA Channel Q Count */
int active:1; /* we are using this stream for transfer now */ int active:1; /* we are using this stream for transfer now */
int period; /* current transfer period */ int period; /* current transfer period */
int periods; /* current count of periods registerd in the DMA engine */ int periods; /* current registered periods in DMA engine */
spinlock_t dma_lock; /* for locking in DMA operations */ spinlock_t dma_lock; /* for locking in DMA operations */
struct snd_pcm_substream *stream; /* the pcm stream */ struct snd_pcm_substream *stream; /* the pcm stream */
unsigned linked:1; /* dma channels linked */ unsigned linked:1; /* dma channels linked */
int offset; /* store start position of the last period in the alsa buffer */ int offset; /* start position of last period in alsa buf */
int (*hw_start)(void); /* interface to start HW interface, e.g. McBSP */ int (*hw_start)(void); /* interface to start HW interface, (McBSP) */
int (*hw_stop)(void); /* interface to stop HW interface, e.g. McBSP */ int (*hw_stop)(void); /* interface to stop HW interface, e.g. McBSP */
}; };
...@@ -127,7 +135,8 @@ void snd_omap_suspend_mixer(void); ...@@ -127,7 +135,8 @@ void snd_omap_suspend_mixer(void);
void snd_omap_resume_mixer(void); void snd_omap_resume_mixer(void);
#endif #endif
int snd_omap_alsa_post_probe(struct platform_device *pdev, struct omap_alsa_codec_config *config); int snd_omap_alsa_post_probe(struct platform_device *pdev,
struct omap_alsa_codec_config *config);
int snd_omap_alsa_remove(struct platform_device *pdev); int snd_omap_alsa_remove(struct platform_device *pdev);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int snd_omap_alsa_suspend(struct platform_device *pdev, pm_message_t state); int snd_omap_alsa_suspend(struct platform_device *pdev, pm_message_t state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment