>From 3a6d9cad619094f8b9928eeeb0889a129bd51f08 Mon Sep 17 00:00:00 2001 From: Jaikumar Dhanapal Date: Tue, 25 Apr 2017 16:58:03 +0530 Subject: [PATCH] staging: bcm2835-audio: changed the printk KERN_* to pr_* bcm2835.h: changed printk(KERN_INFO... to pr_info( changed printk(KERN_WARN... to pr_warn( changed printk(KERN_ALERT... to pr_alert( changed printk(KERN_ERR... to pr_err( Signed-off-by: Jaikumar Dhanapal --- drivers/staging/bcm2835-audio/bcm2835.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/bcm2835-audio/bcm2835.h b/drivers/staging/bcm2835-audio/bcm2835.h index 36e3ef8..0808840 100644 --- a/drivers/staging/bcm2835-audio/bcm2835.h +++ b/drivers/staging/bcm2835-audio/bcm2835.h @@ -26,10 +26,10 @@ #include #include -/* -#define AUDIO_DEBUG_ENABLE -#define AUDIO_VERBOSE_DEBUG_ENABLE - */ +/******* + * #define AUDIO_DEBUG_ENABLE + * #define AUDIO_VERBOSE_DEBUG_ENABLE + ******/ /* Debug macros */ @@ -37,10 +37,10 @@ #ifdef AUDIO_VERBOSE_DEBUG_ENABLE #define audio_debug(fmt, arg...) \ - printk(KERN_INFO"%s:%d " fmt, __func__, __LINE__, ##arg) + pr_info("%s:%d " fmt, __func__, __LINE__, ##arg) #define audio_info(fmt, arg...) \ - printk(KERN_INFO"%s:%d " fmt, __func__, __LINE__, ##arg) + pr_info("%s:%d " fmt, __func__, __LINE__, ##arg) #else @@ -59,13 +59,13 @@ #endif /* AUDIO_DEBUG_ENABLE */ #define audio_error(fmt, arg...) \ - printk(KERN_ERR"%s:%d " fmt, __func__, __LINE__, ##arg) + pr_err("%s:%d " fmt, __func__, __LINE__, ##arg) #define audio_warning(fmt, arg...) \ - printk(KERN_WARNING"%s:%d " fmt, __func__, __LINE__, ##arg) + pr_warn("%s:%d " fmt, __func__, __LINE__, ##arg) #define audio_alert(fmt, arg...) \ - printk(KERN_ALERT"%s:%d " fmt, __func__, __LINE__, ##arg) + pr_alert("%s:%d " fmt, __func__, __LINE__, ##arg) #define MAX_SUBSTREAMS (8) #define AVAIL_SUBSTREAMS_MASK (0xff) @@ -122,6 +122,7 @@ struct bcm2835_alsa_stream { struct semaphore buffers_update_sem; struct semaphore control_sem; spinlock_t lock; + volatile unsigned int control; volatile unsigned int status; -- 2.7.4