From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934810AbdBQSkB (ORCPT ); Fri, 17 Feb 2017 13:40:01 -0500 Received: from mail-yw0-f194.google.com ([209.85.161.194]:33840 "EHLO mail-yw0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934144AbdBQSj7 (ORCPT ); Fri, 17 Feb 2017 13:39:59 -0500 From: Nathan Howard Cc: Nathan Howard , Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Stephen Warren , Lee Jones , Eric Anholt , Michael Zoran , devel@driverdev.osuosl.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: bcm2835-audio: bcm2835.h: fix various coding style issues Date: Fri, 17 Feb 2017 13:39:07 -0500 Message-Id: <1487356776-11449-1-git-send-email-adanhawthorn@gmail.com> X-Mailer: git-send-email 2.7.4 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following coding style issues (as per checkpatch.pl) were resolved. WARNING: Block comments use * on subsequent lines WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... WARNING: Missing a blank line after declarations WARNING: Use of volatile is usually wrong:... WARNING: line over 80 characters CHECK: Concatenated strings should use spaces between elements CHECK: Macro argument 'vol' may be better as '(vol)' to avoid precedence issues Signed-off-by: Nathan Howard --- drivers/staging/bcm2835-audio/bcm2835.h | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/staging/bcm2835-audio/bcm2835.h b/drivers/staging/bcm2835-audio/bcm2835.h index 36e3ef8..16d7006 100644 --- a/drivers/staging/bcm2835-audio/bcm2835.h +++ b/drivers/staging/bcm2835-audio/bcm2835.h @@ -27,8 +27,8 @@ #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) @@ -77,8 +77,11 @@ enum { /* macros for alsa2chip and chip2alsa, instead of functions */ -#define alsa2chip(vol) (uint)(-((vol << 8) / 100)) /* convert alsa to chip volume (defined as macro rather than function call) */ -#define chip2alsa(vol) -((vol * 100) >> 8) /* convert chip to alsa volume */ +// convert alsa to chip volume (defined as macro rather than function call) +#define alsa2chip(vol) (uint)(-(((vol) << 8) / 100)) + +// convert chip to alsa volume +#define chip2alsa(vol) -(((vol) * 100) >> 8) /* Some constants for values .. */ enum snd_bcm2835_route { @@ -122,8 +125,8 @@ struct bcm2835_alsa_stream { struct semaphore buffers_update_sem; struct semaphore control_sem; spinlock_t lock; - volatile unsigned int control; - volatile unsigned int status; + unsigned int control; + unsigned int status; int open; int running; @@ -160,8 +163,10 @@ int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream, unsigned int count, void *src); void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream); -unsigned int bcm2835_audio_retrieve_buffers(struct bcm2835_alsa_stream *alsa_stream); +unsigned int bcm2835_audio_retrieve_buffers( + struct bcm2835_alsa_stream *alsa_stream); void bcm2835_audio_flush_buffers(struct bcm2835_alsa_stream *alsa_stream); -void bcm2835_audio_flush_playback_buffers(struct bcm2835_alsa_stream *alsa_stream); +void bcm2835_audio_flush_playback_buffers( + struct bcm2835_alsa_stream *alsa_stream); #endif /* __SOUND_ARM_BCM2835_H */ -- 2.7.4