Clean-up adsp-main-6.12 series

sound/soc/adi/icap/include/icap.h

@@ -113,62 +113,62 @@
  * @defgroup sample_format_bit Sample format bit field
  * @{
  */
-#define ICAP_FMTBIT_S8 (1<<ICAP_FORMAT_S8)
-#define ICAP_FMTBIT_U8 (1<<ICAP_FORMAT_U8)
-#define ICAP_FMTBIT_S16_LE (1<<ICAP_FORMAT_S16_LE)
-#define ICAP_FMTBIT_S16_BE (1<<ICAP_FORMAT_S16_BE)
-#define ICAP_FMTBIT_U16_LE (1<<ICAP_FORMAT_U16_LE)
-#define ICAP_FMTBIT_U16_BE (1<<ICAP_FORMAT_U16_BE)
-#define ICAP_FMTBIT_S24_LE (1<<ICAP_FORMAT_S24_LE)
-#define ICAP_FMTBIT_S24_BE (1<<ICAP_FORMAT_S24_BE)
-#define ICAP_FMTBIT_U24_LE (1<<ICAP_FORMAT_U24_LE)
-#define ICAP_FMTBIT_U24_BE (1<<ICAP_FORMAT_U24_BE)
-#define ICAP_FMTBIT_S32_LE (1<<ICAP_FORMAT_S32_LE)
-#define ICAP_FMTBIT_S32_BE (1<<ICAP_FORMAT_S32_BE)
-#define ICAP_FMTBIT_U32_LE (1<<ICAP_FORMAT_U32_LE)
-#define ICAP_FMTBIT_U32_BE (1<<ICAP_FORMAT_U32_BE)
-#define ICAP_FMTBIT_FLOAT_LE (1<<ICAP_FORMAT_FLOAT_LE)
-#define ICAP_FMTBIT_FLOAT_BE (1<<ICAP_FORMAT_FLOAT_BE)
-#define ICAP_FMTBIT_FLOAT64_LE (1<<ICAP_FORMAT_FLOAT64_LE)
-#define ICAP_FMTBIT_FLOAT64_BE (1<<ICAP_FORMAT_FLOAT64_BE)
+#define ICAP_FMTBIT_S8 (1 << ICAP_FORMAT_S8)
+#define ICAP_FMTBIT_U8 (1 << ICAP_FORMAT_U8)
+#define ICAP_FMTBIT_S16_LE (1 << ICAP_FORMAT_S16_LE)
+#define ICAP_FMTBIT_S16_BE (1 << ICAP_FORMAT_S16_BE)
+#define ICAP_FMTBIT_U16_LE (1 << ICAP_FORMAT_U16_LE)
+#define ICAP_FMTBIT_U16_BE (1 << ICAP_FORMAT_U16_BE)
+#define ICAP_FMTBIT_S24_LE (1 << ICAP_FORMAT_S24_LE)
+#define ICAP_FMTBIT_S24_BE (1 << ICAP_FORMAT_S24_BE)
+#define ICAP_FMTBIT_U24_LE (1 << ICAP_FORMAT_U24_LE)
+#define ICAP_FMTBIT_U24_BE (1 << ICAP_FORMAT_U24_BE)
+#define ICAP_FMTBIT_S32_LE (1 << ICAP_FORMAT_S32_LE)
+#define ICAP_FMTBIT_S32_BE (1 << ICAP_FORMAT_S32_BE)
+#define ICAP_FMTBIT_U32_LE (1 << ICAP_FORMAT_U32_LE)
+#define ICAP_FMTBIT_U32_BE (1 << ICAP_FORMAT_U32_BE)
+#define ICAP_FMTBIT_FLOAT_LE (1 << ICAP_FORMAT_FLOAT_LE)
+#define ICAP_FMTBIT_FLOAT_BE (1 << ICAP_FORMAT_FLOAT_BE)
+#define ICAP_FMTBIT_FLOAT64_LE (1 << ICAP_FORMAT_FLOAT64_LE)
+#define ICAP_FMTBIT_FLOAT64_BE (1 << ICAP_FORMAT_FLOAT64_BE)
 /**@}*/
 
 /**
  * @defgroup sample_rate Sample rate bit field
  * @{
  */
 /** @brief 5.512kHz sample rate */
-#define ICAP_RATE_5512	(1<<0)
+#define ICAP_RATE_5512	(1 << 0)
 /** @brief 8kHz sample rate */
-#define ICAP_RATE_8000	(1<<1)
+#define ICAP_RATE_8000	(1 << 1)
 /** @brief 11.025kHz sample rate */
-#define ICAP_RATE_11025	(1<<2)
+#define ICAP_RATE_11025	(1 << 2)
 /** @brief 16kHz sample rate */
-#define ICAP_RATE_16000	(1<<3)
+#define ICAP_RATE_16000	(1 << 3)
 /** @brief 22.05kHz sample rate */
-#define ICAP_RATE_22050	(1<<4)
+#define ICAP_RATE_22050	(1 << 4)
 /** @brief 32kHz sample rate */
-#define ICAP_RATE_32000	(1<<5)
+#define ICAP_RATE_32000	(1 << 5)
 /** @brief 44.1kHz sample rate */
-#define ICAP_RATE_44100	(1<<6)
+#define ICAP_RATE_44100	(1 << 6)
 /** @brief 48kHz sample rate */
-#define ICAP_RATE_48000	(1<<7)
+#define ICAP_RATE_48000	(1 << 7)
 /** @brief 64kHz sample rate */
-#define ICAP_RATE_64000	(1<<8)
+#define ICAP_RATE_64000	(1 << 8)
 /** @brief 88.2kHz sample rate */
-#define ICAP_RATE_88200	(1<<9)
+#define ICAP_RATE_88200	(1 << 9)
 /** @brief 96kHz sample rate */
-#define ICAP_RATE_96000	(1<<10)
+#define ICAP_RATE_96000	(1 << 10)
 /** @brief 176.4kHz sample rate */
-#define ICAP_RATE_176400	(1<<11)
+#define ICAP_RATE_176400	(1 << 11)
 /** @brief 192kHz sample rate */
-#define ICAP_RATE_192000	(1<<12)
+#define ICAP_RATE_192000	(1 << 12)
 /** @brief 352.8kHz sample rate */
-#define ICAP_RATE_352800	(1<<13)
+#define ICAP_RATE_352800	(1 << 13)
 /** @brief 384kHz sample rate */
-#define ICAP_RATE_384000	(1<<14)
+#define ICAP_RATE_384000	(1 << 14)
 /** @brief Linear range of frequencies */
-#define ICAP_RATE_ALL_FREQ	(1<<30)
+#define ICAP_RATE_ALL_FREQ	(1 << 30)
 
 /** @brief Range 8kHz to 44.1kHz */
 #define ICAP_RATES_8000_44100 ( \
@@ -234,7 +234,6 @@ struct icap_instance {
 	u32 seq_num;
 };
 
-
 /**
  * @defgroup msg_structs Message structs send and received by application and device sides.
  * @{
@@ -288,7 +287,6 @@ struct icap_buf_frags {
 	u32 frags;
 } ICAP_PACKED_END;
 
-
 /* @brief Struct send by icap_frags() application function,
  * used with #ICAP_BUF_SCATTERED buffer type
  */

sound/soc/adi/icap/src/icap.c

@@ -68,7 +68,6 @@ int32_t icap_application_init(struct icap_instance *icap, char *name,
 	if ((icap == NULL) || (cb == NULL))
 		return -ICAP_ERROR_INVALID;
 
-
 	if (icap->callbacks != NULL)
 		return -ICAP_ERROR_BUSY;
 
@@ -260,13 +259,11 @@ s32 icap_add_src(struct icap_instance *icap, struct icap_buf_descriptor *buf)
 	if (buf == NULL)
 		return -ICAP_ERROR_INVALID;
 
-
 	ret = icap_send_msg(icap, ICAP_MSG_ADD_SRC, buf,
 			    sizeof(struct icap_buf_descriptor), 1, &response);
 	if (ret)
 		return ret;
 
-
 	if (response.header.payload_len != sizeof(uint32_t))
 		return -ICAP_ERROR_MSG_LEN;
 

sound/soc/adi/sc5xx-sport-sharc.c

@@ -297,7 +297,6 @@ int sport_tx_stop(struct sport_device *sport)
 }
 EXPORT_SYMBOL(sport_tx_stop);
 
-
 void sport_rx_stop_work_func(struct work_struct *work)
 {
 	struct sport_device *sport = container_of(work, struct sport_device, send_rx_stop_work);
@@ -866,7 +865,6 @@ void rpmsg_icap_sport_remove(struct rpmsg_device *rpdev)
 
 	spin_unlock_irqrestore(&sport->icap_spinlock, flags);
 
-
 	if (sport->tx_substream &&
 	    sport->tx_substream->runtime &&
 	    snd_pcm_running(sport->tx_substream)) {

sound/soc/adi/sharc-alsa-asoc-card.c

@@ -142,15 +142,13 @@ static int sa_pcm_hw_params(struct snd_soc_component *component,
 	return 0;
 }
 
-
 static int sa_pcm_hw_free(struct snd_soc_component *component,
 	struct snd_pcm_substream *substream)
 {
 	snd_pcm_lib_free_pages(substream);
 	return 0;
 }
 
-
 static snd_pcm_uframes_t sa_pcm_pointer(struct snd_soc_component *component,
 	struct snd_pcm_substream *substream)
 {
@@ -494,7 +492,6 @@ static void sa_delayed_probe(struct work_struct *work)
 		}
 		sa->cpu_num++;
 
-
 		/* Initialize ASoC platform driver */
 		memset(&sa_comp, 0, sizeof(sa_comp));
 		sprintf(sa_comp.component_driver_name, "sharc-alsa-platform_%d", link_id);