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: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/include/asm-arm/arch-omap/omap-alsa.h b/include/asm-arm/arch-omap/omap-alsa.h
index 0f8a7d3..58879bc 100644 (file)
--- a/include/asm-arm/arch-omap/omap-alsa.h
+++ b/include/asm-arm/arch-omap/omap-alsa.h
@@ -49,15 +49,23 @@
  * Debug functions
  */
 #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
-#define DPRINTK(ARGS...)  printk(KERN_INFO "<%s>: ",__FUNCTION__);printk(ARGS)
-#define ADEBUG() printk("XXX Alsa debug f:%s, l:%d\n", __FUNCTION__, __LINE__)
-#define FN_IN printk(KERN_INFO "[%s]: start\n", __FUNCTION__)
-#define FN_OUT(n) printk(KERN_INFO "[%s]: end(%u)\n",__FUNCTION__, n)
+#define DPRINTK(ARGS...)                                       \
+       do {                                                    \
+               printk(KERN_INFO "<%s>: ", __func__);           \
+               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
 #define DPRINTK(ARGS...)       /* nop */
 #define ADEBUG()               /* nop */
@@ -81,12 +89,12 @@ struct audio_stream {
        char dma_q_count;       /* DMA Channel Q Count */
        int active:1;           /* we are using this stream for transfer now */
        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 */
        struct snd_pcm_substream *stream;       /* the pcm stream */
        unsigned linked:1;      /* dma channels linked */
-       int offset;             /* store start position of the last period in the alsa buffer */
-       int (*hw_start)(void);  /* interface to start HW interface, e.g. McBSP */
+       int offset;             /* start position of last period in alsa buf */
+       int (*hw_start)(void);  /* interface to start HW interface, (McBSP) */
        int (*hw_stop)(void);   /* interface to stop HW interface, e.g. McBSP */
 };
 
@@ -127,7 +135,8 @@ void snd_omap_suspend_mixer(void);
 void snd_omap_resume_mixer(void);
 #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);
 #ifdef CONFIG_PM
 int snd_omap_alsa_suspend(struct platform_device *pdev, pm_message_t state);