staging/easycap: add first level indentation to easycap_sound.c

Add the first level indentation to easycap_sound.c with astyle -t8.
41 lines over 80 characters were left out for further fix

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/easycap/easycap_sound.c

@@ -47,7 +47,8 @@ static const struct snd_pcm_hardware alsa_hardware = {
 	.rate_max = 48000,
 	.channels_min = 2,
 	.channels_max = 2,
-	.buffer_bytes_max = PAGE_SIZE * PAGES_PER_AUDIO_FRAGMENT *
+	.buffer_bytes_max = PAGE_SIZE *
+			    PAGES_PER_AUDIO_FRAGMENT *
 			    AUDIO_FRAGMENT_MANY,
 	.period_bytes_min = PAGE_SIZE * PAGES_PER_AUDIO_FRAGMENT,
 	.period_bytes_max = PAGE_SIZE * PAGES_PER_AUDIO_FRAGMENT * 2,
@@ -67,56 +68,56 @@ static const struct snd_pcm_hardware alsa_hardware = {
 void
 easycap_alsa_complete(struct urb *purb)
 {
-struct easycap *peasycap;
-struct snd_pcm_substream *pss;
-struct snd_pcm_runtime *prt;
-int dma_bytes, fragment_bytes;
-int isfragment;
-u8 *p1, *p2;
-s16 tmp;
-int i, j, more, much, rc;
+	struct easycap *peasycap;
+	struct snd_pcm_substream *pss;
+	struct snd_pcm_runtime *prt;
+	int dma_bytes, fragment_bytes;
+	int isfragment;
+	u8 *p1, *p2;
+	s16 tmp;
+	int i, j, more, much, rc;
 #ifdef UPSAMPLE
-int k;
-s16 oldaudio, newaudio, delta;
+	int k;
+	s16 oldaudio, newaudio, delta;
 #endif /*UPSAMPLE*/
 
-JOT(16, "\n");
+	JOT(16, "\n");
 
-if (NULL == purb) {
+	if (NULL == purb) {
 		SAY("ERROR: purb is NULL\n");
 		return;
-}
-peasycap = purb->context;
-if (NULL == peasycap) {
+	}
+	peasycap = purb->context;
+	if (NULL == peasycap) {
 		SAY("ERROR: peasycap is NULL\n");
 		return;
-}
-if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+	}
+	if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
 		SAY("ERROR: bad peasycap\n");
 		return;
-}
-much = 0;
-if (peasycap->audio_idle) {
+	}
+	much = 0;
+	if (peasycap->audio_idle) {
 		JOM(16, "%i=audio_idle  %i=audio_isoc_streaming\n",
 		    peasycap->audio_idle, peasycap->audio_isoc_streaming);
 		if (peasycap->audio_isoc_streaming)
 			goto resubmit;
-}
+	}
 /*---------------------------------------------------------------------------*/
-pss = peasycap->psubstream;
-if (NULL == pss)
+	pss = peasycap->psubstream;
+	if (NULL == pss)
 		goto resubmit;
-prt = pss->runtime;
-if (NULL == prt)
+	prt = pss->runtime;
+	if (NULL == prt)
 		goto resubmit;
-dma_bytes = (int)prt->dma_bytes;
-if (0 == dma_bytes)
+	dma_bytes = (int)prt->dma_bytes;
+	if (0 == dma_bytes)
 		goto resubmit;
-fragment_bytes = 4 * ((int)prt->period_size);
-if (0 == fragment_bytes)
+	fragment_bytes = 4 * ((int)prt->period_size);
+	if (0 == fragment_bytes)
 		goto resubmit;
 /* -------------------------------------------------------------------------*/
-if (purb->status) {
+	if (purb->status) {
 		if ((-ESHUTDOWN == purb->status) || (-ENOENT == purb->status)) {
 			JOM(16, "urb status -ESHUTDOWN or -ENOENT\n");
 			return;
@@ -124,7 +125,7 @@ if (purb->status) {
 		SAM("ERROR: non-zero urb status: -%s: %d\n",
 		    strerror(purb->status), purb->status);
 		goto resubmit;
-}
+	}
 /*---------------------------------------------------------------------------*/
 /*
  *  PROCEED HERE WHEN NO ERROR
@@ -132,10 +133,10 @@ if (purb->status) {
 /*---------------------------------------------------------------------------*/
 
 #ifdef UPSAMPLE
-oldaudio = peasycap->oldaudio;
+	oldaudio = peasycap->oldaudio;
 #endif /*UPSAMPLE*/
 
-for (i = 0;  i < purb->number_of_packets; i++) {
+	for (i = 0;  i < purb->number_of_packets; i++) {
 		if (purb->iso_frame_desc[i].status < 0) {
 			SAM("-%s: %d\n",
 			    strerror(purb->iso_frame_desc[i].status),
@@ -155,12 +156,12 @@ for (i = 0;  i < purb->number_of_packets; i++) {
 				p1 = (u8 *)(purb->transfer_buffer +
 					purb->iso_frame_desc[i].offset);
 
-/*---------------------------------------------------------------------------*/
-/*
- *  COPY more BYTES FROM ISOC BUFFER TO THE DMA BUFFER,
- *  CONVERTING 8-BIT MONO TO 16-BIT SIGNED LITTLE-ENDIAN SAMPLES IF NECESSARY
+				/*
+				 *  COPY more BYTES FROM ISOC BUFFER
+				 *  TO THE DMA BUFFER, CONVERTING
+				 *  8-BIT MONO TO 16-BIT SIGNED
+				 *  LITTLE-ENDIAN SAMPLES IF NECESSARY
 				 */
-/*---------------------------------------------------------------------------*/
 				while (more) {
 					if (0 > more) {
 						SAM("MISTAKE: more is negative\n");
@@ -189,30 +190,24 @@ for (i = 0;  i < purb->number_of_packets; i++) {
 						if (much % 16)
 							JOM(8, "MISTAKE? much"
 							    " is not divisible by 16\n");
-					if (much > (16 *
-							more))
+						if (much > (16 * more))
 							much = 16 *
 							       more;
-					p2 = (u8 *)(prt->dma_area +
-						peasycap->dma_fill);
+						p2 = (u8 *)(prt->dma_area + peasycap->dma_fill);
 
 						for (j = 0;  j < (much/16);  j++) {
 							newaudio =  ((int) *p1) - 128;
-						newaudio = 128 *
-								newaudio;
+							newaudio = 128 * newaudio;
 
-						delta = (newaudio - oldaudio)
-									/ 4;
+							delta = (newaudio - oldaudio) / 4;
 							tmp = oldaudio + delta;
 
 							for (k = 0;  k < 4;  k++) {
 								*p2 = (0x00FF & tmp);
-							*(p2 + 1) = (0xFF00 &
-								tmp) >> 8;
+								*(p2 + 1) = (0xFF00 & tmp) >> 8;
 								p2 += 2;
 								*p2 = (0x00FF & tmp);
-							*(p2 + 1) = (0xFF00 &
-								tmp) >> 8;
+								*(p2 + 1) = (0xFF00 & tmp) >> 8;
 								p2 += 2;
 								tmp += delta;
 							}
@@ -223,37 +218,32 @@ for (i = 0;  i < purb->number_of_packets; i++) {
 #else /*!UPSAMPLE*/
 						if (much > (2 * more))
 							much = 2 * more;
-					p2 = (u8 *)(prt->dma_area +
-						peasycap->dma_fill);
+						p2 = (u8 *)(prt->dma_area + peasycap->dma_fill);
 
 						for (j = 0;  j < (much / 2);  j++) {
 							tmp = ((int) *p1) - 128;
 							tmp = 128 * tmp;
 							*p2 = (0x00FF & tmp);
-						*(p2 + 1) = (0xFF00 & tmp) >>
-									8;
-						p1++;  p2 += 2;
+							*(p2 + 1) = (0xFF00 & tmp) >> 8;
+							p1++;
+							p2 += 2;
 							more--;
 						}
 #endif /*UPSAMPLE*/
 					}
 					peasycap->dma_fill += much;
 					if (peasycap->dma_fill >= peasycap->dma_next) {
-					isfragment = peasycap->dma_fill /
-						fragment_bytes;
+						isfragment = peasycap->dma_fill / fragment_bytes;
 						if (0 > isfragment) {
 							SAM("MISTAKE: isfragment is "
 							    "negative\n");
 							return;
 						}
-					peasycap->dma_read = (isfragment
-						- 1) * fragment_bytes;
-					peasycap->dma_next = (isfragment
-						+ 1) * fragment_bytes;
-					if (dma_bytes < peasycap->dma_next) {
-						peasycap->dma_next =
-								fragment_bytes;
-					}
+						peasycap->dma_read = (isfragment - 1) * fragment_bytes;
+						peasycap->dma_next = (isfragment + 1) * fragment_bytes;
+						if (dma_bytes < peasycap->dma_next)
+							peasycap->dma_next = fragment_bytes;
+
 						if (0 <= peasycap->dma_read) {
 							JOM(8, "snd_pcm_period_elap"
 							    "sed(), %i="
@@ -271,17 +261,17 @@ for (i = 0;  i < purb->number_of_packets; i++) {
 		}
 
 #ifdef UPSAMPLE
-peasycap->oldaudio = oldaudio;
+		peasycap->oldaudio = oldaudio;
 #endif /*UPSAMPLE*/
 
-}
+	}
 /*---------------------------------------------------------------------------*/
 /*
  *  RESUBMIT THIS URB
  */
 /*---------------------------------------------------------------------------*/
 resubmit:
-if (peasycap->audio_isoc_streaming) {
+	if (peasycap->audio_isoc_streaming) {
 		rc = usb_submit_urb(purb, GFP_ATOMIC);
 		if (rc) {
 			if ((-ENODEV != rc) && (-ENOENT != rc)) {
@@ -293,191 +283,192 @@ if (peasycap->audio_isoc_streaming) {
 			if (0 < peasycap->audio_isoc_streaming)
 				(peasycap->audio_isoc_streaming)--;
 		}
-}
-return;
+	}
+	return;
 }
 /*****************************************************************************/
 static int easycap_alsa_open(struct snd_pcm_substream *pss)
 {
-struct snd_pcm *psnd_pcm;
-struct snd_card *psnd_card;
-struct easycap *peasycap;
+	struct snd_pcm *psnd_pcm;
+	struct snd_card *psnd_card;
+	struct easycap *peasycap;
 
-JOT(4, "\n");
-if (NULL == pss) {
+	JOT(4, "\n");
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-psnd_pcm = pss->pcm;
-if (NULL == psnd_pcm) {
+	}
+	psnd_pcm = pss->pcm;
+	if (NULL == psnd_pcm) {
 		SAY("ERROR:  psnd_pcm is NULL\n");
 		return -EFAULT;
-}
-psnd_card = psnd_pcm->card;
-if (NULL == psnd_card) {
+	}
+	psnd_card = psnd_pcm->card;
+	if (NULL == psnd_card) {
 		SAY("ERROR:  psnd_card is NULL\n");
 		return -EFAULT;
-}
+	}
 
-peasycap = psnd_card->private_data;
-if (NULL == peasycap) {
+	peasycap = psnd_card->private_data;
+	if (NULL == peasycap) {
 		SAY("ERROR:  peasycap is NULL\n");
 		return -EFAULT;
-}
-if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+	}
+	if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
 		SAY("ERROR: bad peasycap\n");
 		return -EFAULT;
-}
-if (peasycap->psnd_card != psnd_card) {
+	}
+	if (peasycap->psnd_card != psnd_card) {
 		SAM("ERROR: bad peasycap->psnd_card\n");
 		return -EFAULT;
-}
-if (NULL != peasycap->psubstream) {
+	}
+	if (NULL != peasycap->psubstream) {
 		SAM("ERROR: bad peasycap->psubstream\n");
 		return -EFAULT;
-}
-pss->private_data = peasycap;
-peasycap->psubstream = pss;
-pss->runtime->hw = peasycap->alsa_hardware;
-pss->runtime->private_data = peasycap;
-pss->private_data = peasycap;
+	}
+	pss->private_data = peasycap;
+	peasycap->psubstream = pss;
+	pss->runtime->hw = peasycap->alsa_hardware;
+	pss->runtime->private_data = peasycap;
+	pss->private_data = peasycap;
 
-if (0 != easycap_sound_setup(peasycap)) {
+	if (0 != easycap_sound_setup(peasycap)) {
 		JOM(4, "ending unsuccessfully\n");
 		return -EFAULT;
-}
-JOM(4, "ending successfully\n");
-return 0;
+	}
+	JOM(4, "ending successfully\n");
+	return 0;
 }
 /*****************************************************************************/
 static int easycap_alsa_close(struct snd_pcm_substream *pss)
 {
-struct easycap *peasycap;
+	struct easycap *peasycap;
 
-JOT(4, "\n");
-if (NULL == pss) {
+	JOT(4, "\n");
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-peasycap = snd_pcm_substream_chip(pss);
-if (NULL == peasycap) {
+	}
+	peasycap = snd_pcm_substream_chip(pss);
+	if (NULL == peasycap) {
 		SAY("ERROR:  peasycap is NULL\n");
 		return -EFAULT;
-}
-if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+	}
+	if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
 		SAY("ERROR: bad peasycap\n");
 		return -EFAULT;
-}
-pss->private_data = NULL;
-peasycap->psubstream = NULL;
-JOT(4, "ending successfully\n");
-return 0;
+	}
+	pss->private_data = NULL;
+	peasycap->psubstream = NULL;
+	JOT(4, "ending successfully\n");
+	return 0;
 }
 /*****************************************************************************/
 static int easycap_alsa_vmalloc(struct snd_pcm_substream *pss, size_t sz)
 {
-struct snd_pcm_runtime *prt;
-JOT(4, "\n");
+	struct snd_pcm_runtime *prt;
+	JOT(4, "\n");
 
-if (NULL == pss) {
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-prt = pss->runtime;
-if (NULL == prt) {
+	}
+	prt = pss->runtime;
+	if (NULL == prt) {
 		SAY("ERROR: substream.runtime is NULL\n");
 		return -EFAULT;
-}
-if (prt->dma_area) {
+	}
+	if (prt->dma_area) {
 		if (prt->dma_bytes > sz)
 			return 0;
 		vfree(prt->dma_area);
-}
-prt->dma_area = vmalloc(sz);
-if (NULL == prt->dma_area)
+	}
+	prt->dma_area = vmalloc(sz);
+	if (NULL == prt->dma_area)
 		return -ENOMEM;
-prt->dma_bytes = sz;
-return 0;
+	prt->dma_bytes = sz;
+	return 0;
 }
 /*****************************************************************************/
 static int easycap_alsa_hw_params(struct snd_pcm_substream *pss,
 				 struct snd_pcm_hw_params *phw)
 {
-int rc;
+	int rc;
 
-JOT(4, "%i\n", (params_buffer_bytes(phw)));
-if (NULL == pss) {
+	JOT(4, "%i\n", (params_buffer_bytes(phw)));
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-rc = easycap_alsa_vmalloc(pss, params_buffer_bytes(phw));
-if (rc)
+	}
+	rc = easycap_alsa_vmalloc(pss, params_buffer_bytes(phw));
+	if (rc)
 		return rc;
-return 0;
+	return 0;
 }
 /*****************************************************************************/
 static int easycap_alsa_hw_free(struct snd_pcm_substream *pss)
 {
-struct snd_pcm_runtime *prt;
-JOT(4, "\n");
+	struct snd_pcm_runtime *prt;
+	JOT(4, "\n");
 
-if (NULL == pss) {
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-prt = pss->runtime;
-if (NULL == prt) {
+	}
+	prt = pss->runtime;
+	if (NULL == prt) {
 		SAY("ERROR: substream.runtime is NULL\n");
 		return -EFAULT;
-}
-if (NULL != prt->dma_area) {
+	}
+	if (NULL != prt->dma_area) {
 		JOT(8, "prt->dma_area = %p\n", prt->dma_area);
 		vfree(prt->dma_area);
 		prt->dma_area = NULL;
-} else
+	} else
 		JOT(8, "dma_area already freed\n");
-return 0;
+	return 0;
 }
 /*****************************************************************************/
 static int easycap_alsa_prepare(struct snd_pcm_substream *pss)
 {
-struct easycap *peasycap;
-struct snd_pcm_runtime *prt;
+	struct easycap *peasycap;
+	struct snd_pcm_runtime *prt;
 
-JOT(4, "\n");
-if (NULL == pss) {
+	JOT(4, "\n");
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-prt = pss->runtime;
-peasycap = snd_pcm_substream_chip(pss);
-if (NULL == peasycap) {
+	}
+	prt = pss->runtime;
+	peasycap = snd_pcm_substream_chip(pss);
+	if (NULL == peasycap) {
 		SAY("ERROR:  peasycap is NULL\n");
 		return -EFAULT;
-}
-if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+	}
+	if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
 		SAY("ERROR: bad peasycap\n");
 		return -EFAULT;
-}
+	}
 
-JOM(16, "ALSA decides %8i Hz=rate\n", (int)pss->runtime->rate);
-JOM(16, "ALSA decides %8i   =period_size\n", (int)pss->runtime->period_size);
-JOM(16, "ALSA decides %8i   =periods\n", (int)pss->runtime->periods);
-JOM(16, "ALSA decides %8i   =buffer_size\n", (int)pss->runtime->buffer_size);
-JOM(16, "ALSA decides %8i   =dma_bytes\n", (int)pss->runtime->dma_bytes);
-JOM(16, "ALSA decides %8i   =boundary\n", (int)pss->runtime->boundary);
-JOM(16, "ALSA decides %8i   =period_step\n", (int)pss->runtime->period_step);
-JOM(16, "ALSA decides %8i   =sample_bits\n", (int)pss->runtime->sample_bits);
-JOM(16, "ALSA decides %8i   =frame_bits\n", (int)pss->runtime->frame_bits);
-JOM(16, "ALSA decides %8i   =min_align\n", (int)pss->runtime->min_align);
-JOM(12, "ALSA decides %8i   =hw_ptr_base\n", (int)pss->runtime->hw_ptr_base);
-JOM(12, "ALSA decides %8i   =hw_ptr_interrupt\n",
-					(int)pss->runtime->hw_ptr_interrupt);
-if (prt->dma_bytes != 4 * ((int)prt->period_size) * ((int)prt->periods)) {
+	JOM(16, "ALSA decides %8i Hz=rate\n", pss->runtime->rate);
+	JOM(16, "ALSA decides %8ld =period_size\n", pss->runtime->period_size);
+	JOM(16, "ALSA decides %8i =periods\n", pss->runtime->periods);
+	JOM(16, "ALSA decides %8ld =buffer_size\n", pss->runtime->buffer_size);
+	JOM(16, "ALSA decides %8zd =dma_bytes\n", pss->runtime->dma_bytes);
+	JOM(16, "ALSA decides %8ld =boundary\n", pss->runtime->boundary);
+	JOM(16, "ALSA decides %8i =period_step\n", pss->runtime->period_step);
+	JOM(16, "ALSA decides %8i =sample_bits\n", pss->runtime->sample_bits);
+	JOM(16, "ALSA decides %8i =frame_bits\n", pss->runtime->frame_bits);
+	JOM(16, "ALSA decides %8ld =min_align\n", pss->runtime->min_align);
+	JOM(12, "ALSA decides %8ld =hw_ptr_base\n", pss->runtime->hw_ptr_base);
+	JOM(12, "ALSA decides %8ld =hw_ptr_interrupt\n",
+		pss->runtime->hw_ptr_interrupt);
+
+	if (prt->dma_bytes != 4 * ((int)prt->period_size) * ((int)prt->periods)) {
 		SAY("MISTAKE:  unexpected ALSA parameters\n");
 		return -ENOENT;
-}
-return 0;
+	}
+	return 0;
 }
 /*****************************************************************************/
 static int easycap_alsa_ack(struct snd_pcm_substream *pss)
@@ -487,81 +478,81 @@ static int easycap_alsa_ack(struct snd_pcm_substream *pss)
 /*****************************************************************************/
 static int easycap_alsa_trigger(struct snd_pcm_substream *pss, int cmd)
 {
-struct easycap *peasycap;
-int retval;
+	struct easycap *peasycap;
+	int retval;
 
-JOT(4, "%i=cmd cf %i=START %i=STOP\n", cmd, SNDRV_PCM_TRIGGER_START,
+	JOT(4, "%i=cmd cf %i=START %i=STOP\n", cmd, SNDRV_PCM_TRIGGER_START,
 	    SNDRV_PCM_TRIGGER_STOP);
-if (NULL == pss) {
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-peasycap = snd_pcm_substream_chip(pss);
-if (NULL == peasycap) {
+	}
+	peasycap = snd_pcm_substream_chip(pss);
+	if (NULL == peasycap) {
 		SAY("ERROR:  peasycap is NULL\n");
 		return -EFAULT;
-}
-if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+	}
+	if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
 		SAY("ERROR: bad peasycap\n");
 		return -EFAULT;
-}
+	}
 
-switch (cmd) {
-case SNDRV_PCM_TRIGGER_START: {
+	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_START: {
 		peasycap->audio_idle = 0;
 		break;
-}
-case SNDRV_PCM_TRIGGER_STOP: {
+	}
+	case SNDRV_PCM_TRIGGER_STOP: {
 		peasycap->audio_idle = 1;
 		break;
-}
-default:
+	}
+	default:
 		retval = -EINVAL;
-}
-return 0;
+	}
+	return 0;
 }
 /*****************************************************************************/
 static snd_pcm_uframes_t easycap_alsa_pointer(struct snd_pcm_substream *pss)
 {
-struct easycap *peasycap;
-snd_pcm_uframes_t offset;
+	struct easycap *peasycap;
+	snd_pcm_uframes_t offset;
 
-JOT(16, "\n");
-if (NULL == pss) {
+	JOT(16, "\n");
+	if (NULL == pss) {
 		SAY("ERROR:  pss is NULL\n");
 		return -EFAULT;
-}
-peasycap = snd_pcm_substream_chip(pss);
-if (NULL == peasycap) {
+	}
+	peasycap = snd_pcm_substream_chip(pss);
+	if (NULL == peasycap) {
 		SAY("ERROR:  peasycap is NULL\n");
 		return -EFAULT;
-}
-if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+	}
+	if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
 		SAY("ERROR: bad peasycap\n");
 		return -EFAULT;
-}
-if ((0 != peasycap->audio_eof) || (0 != peasycap->audio_idle)) {
+	}
+	if ((0 != peasycap->audio_eof) || (0 != peasycap->audio_idle)) {
 		JOM(8, "returning -EIO because  "
 		    "%i=audio_idle  %i=audio_eof\n",
 		    peasycap->audio_idle, peasycap->audio_eof);
 		return -EIO;
-}
+	}
 /*---------------------------------------------------------------------------*/
-if (0 > peasycap->dma_read) {
+	if (0 > peasycap->dma_read) {
 		JOM(8, "returning -EBUSY\n");
 		return -EBUSY;
-}
-offset = ((snd_pcm_uframes_t)peasycap->dma_read)/4;
-JOM(8, "ALSA decides %8i   =hw_ptr_base\n", (int)pss->runtime->hw_ptr_base);
-JOM(8, "ALSA decides %8i   =hw_ptr_interrupt\n",
+	}
+	offset = ((snd_pcm_uframes_t)peasycap->dma_read)/4;
+	JOM(8, "ALSA decides %8i   =hw_ptr_base\n", (int)pss->runtime->hw_ptr_base);
+	JOM(8, "ALSA decides %8i   =hw_ptr_interrupt\n",
 	    (int)pss->runtime->hw_ptr_interrupt);
-JOM(8, "%7i=offset %7i=dma_read %7i=dma_next\n",
+	JOM(8, "%7i=offset %7i=dma_read %7i=dma_next\n",
 	    (int)offset, peasycap->dma_read, peasycap->dma_next);
-return offset;
+	return offset;
 }
 /*****************************************************************************/
-static struct page *easycap_alsa_page(struct snd_pcm_substream *pss,
-				unsigned long offset)
+static struct page *
+easycap_alsa_page(struct snd_pcm_substream *pss, unsigned long offset)
 {
 	return vmalloc_to_page(pss->runtime->dma_area + offset);
 }
@@ -589,37 +580,36 @@ static struct snd_pcm_ops easycap_alsa_pcm_ops = {
 /*---------------------------------------------------------------------------*/
 int easycap_alsa_probe(struct easycap *peasycap)
 {
-int rc;
-struct snd_card *psnd_card;
-struct snd_pcm *psnd_pcm;
+	int rc;
+	struct snd_card *psnd_card;
+	struct snd_pcm *psnd_pcm;
 
-if (NULL == peasycap) {
+	if (NULL == peasycap) {
 		SAY("ERROR: peasycap is NULL\n");
 		return -ENODEV;
-}
-if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+	}
+	if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
 		SAY("ERROR: bad peasycap\n");
 		return -EFAULT;
-}
-if (0 > peasycap->minor) {
+	}
+	if (0 > peasycap->minor) {
 		SAY("ERROR: no minor\n");
 		return -ENODEV;
-}
+	}
 
-peasycap->alsa_hardware = alsa_hardware;
-if (true == peasycap->microphone) {
+	peasycap->alsa_hardware = alsa_hardware;
+	if (true == peasycap->microphone) {
 		peasycap->alsa_hardware.rates = SNDRV_PCM_RATE_32000;
 		peasycap->alsa_hardware.rate_min = 32000;
 		peasycap->alsa_hardware.rate_max = 32000;
-} else {
+	} else {
 		peasycap->alsa_hardware.rates = SNDRV_PCM_RATE_48000;
 		peasycap->alsa_hardware.rate_min = 48000;
 		peasycap->alsa_hardware.rate_max = 48000;
-}
+	}
 
 	if (0 != snd_card_create(SNDRV_DEFAULT_IDX1, "easycap_alsa",
-					THIS_MODULE, 0,
-					&psnd_card)) {
+				THIS_MODULE, 0, &psnd_card)) {
 		SAY("ERROR: Cannot do ALSA snd_card_create()\n");
 		return -EFAULT;
 	}
@@ -657,7 +647,7 @@ if (true == peasycap->microphone) {
 		;
 		SAM("registered %s\n", &psnd_card->id[0]);
 	}
-return 0;
+	return 0;
 }
 #endif /*! CONFIG_EASYCAP_OSS */
 
@@ -675,50 +665,50 @@ return 0;
 int
 easycap_sound_setup(struct easycap *peasycap)
 {
-int rc;
+	int rc;
 
-JOM(4, "starting initialization\n");
+	JOM(4, "starting initialization\n");
 
-if (NULL == peasycap) {
+	if (NULL == peasycap) {
 		SAY("ERROR:  peasycap is NULL.\n");
 		return -EFAULT;
-}
-if (NULL == peasycap->pusb_device) {
+	}
+	if (NULL == peasycap->pusb_device) {
 		SAM("ERROR: peasycap->pusb_device is NULL\n");
 		return -ENODEV;
-}
-JOM(16, "0x%08lX=peasycap->pusb_device\n", (long int)peasycap->pusb_device);
+	}
+	JOM(16, "0x%08lX=peasycap->pusb_device\n", (long int)peasycap->pusb_device);
 
-rc = audio_setup(peasycap);
-JOM(8, "audio_setup() returned %i\n", rc);
+	rc = audio_setup(peasycap);
+	JOM(8, "audio_setup() returned %i\n", rc);
 
-if (NULL == peasycap->pusb_device) {
+	if (NULL == peasycap->pusb_device) {
 		SAM("ERROR: peasycap->pusb_device has become NULL\n");
 		return -ENODEV;
-}
+	}
 /*---------------------------------------------------------------------------*/
-if (NULL == peasycap->pusb_device) {
+	if (NULL == peasycap->pusb_device) {
 		SAM("ERROR: peasycap->pusb_device has become NULL\n");
 		return -ENODEV;
-}
-rc = usb_set_interface(peasycap->pusb_device, peasycap->audio_interface,
+	}
+	rc = usb_set_interface(peasycap->pusb_device, peasycap->audio_interface,
 			       peasycap->audio_altsetting_on);
-JOM(8, "usb_set_interface(.,%i,%i) returned %i\n", peasycap->audio_interface,
+	JOM(8, "usb_set_interface(.,%i,%i) returned %i\n", peasycap->audio_interface,
 	    peasycap->audio_altsetting_on, rc);
 
-rc = wakeup_device(peasycap->pusb_device);
-JOM(8, "wakeup_device() returned %i\n", rc);
+	rc = wakeup_device(peasycap->pusb_device);
+	JOM(8, "wakeup_device() returned %i\n", rc);
 
-peasycap->audio_eof = 0;
-peasycap->audio_idle = 0;
+	peasycap->audio_eof = 0;
+	peasycap->audio_idle = 0;
 
-peasycap->timeval1.tv_sec  = 0;
-peasycap->timeval1.tv_usec = 0;
+	peasycap->timeval1.tv_sec  = 0;
+	peasycap->timeval1.tv_usec = 0;
 
-submit_audio_urbs(peasycap);
+	submit_audio_urbs(peasycap);
 
-JOM(4, "finished initialization\n");
-return 0;
+	JOM(4, "finished initialization\n");
+	return 0;
 }
 /*****************************************************************************/
 /*---------------------------------------------------------------------------*/
@@ -729,25 +719,25 @@ return 0;
 int
 submit_audio_urbs(struct easycap *peasycap)
 {
-struct data_urb *pdata_urb;
-struct urb *purb;
-struct list_head *plist_head;
-int j, isbad, nospc, m, rc;
-int isbuf;
+	struct data_urb *pdata_urb;
+	struct urb *purb;
+	struct list_head *plist_head;
+	int j, isbad, nospc, m, rc;
+	int isbuf;
 
-if (NULL == peasycap) {
+	if (NULL == peasycap) {
 		SAY("ERROR: peasycap is NULL\n");
 		return -EFAULT;
-}
-if (NULL == peasycap->purb_audio_head) {
+	}
+	if (NULL == peasycap->purb_audio_head) {
 		SAM("ERROR: peasycap->urb_audio_head uninitialized\n");
 		return -EFAULT;
-}
-if (NULL == peasycap->pusb_device) {
+	}
+	if (NULL == peasycap->pusb_device) {
 		SAM("ERROR: peasycap->pusb_device is NULL\n");
 		return -EFAULT;
-}
-if (!peasycap->audio_isoc_streaming) {
+	}
+	if (!peasycap->audio_isoc_streaming) {
 		JOM(4, "initial submission of all audio urbs\n");
 		rc = usb_set_interface(peasycap->pusb_device,
 				       peasycap->audio_interface,
@@ -756,7 +746,9 @@ if (!peasycap->audio_isoc_streaming) {
 		    peasycap->audio_interface,
 		    peasycap->audio_altsetting_on, rc);
 
-	isbad = 0;  nospc = 0;  m = 0;
+		isbad = 0;
+		nospc = 0;
+		m = 0;
 		list_for_each(plist_head, (peasycap->purb_audio_head)) {
 			pdata_urb = list_entry(plist_head, struct data_urb, list_head);
 			if (NULL != pdata_urb) {
@@ -766,14 +758,11 @@ if (!peasycap->audio_isoc_streaming) {
 
 					purb->interval = 1;
 					purb->dev = peasycap->pusb_device;
-				purb->pipe =
-					usb_rcvisocpipe(peasycap->pusb_device,
+					purb->pipe = usb_rcvisocpipe(peasycap->pusb_device,
 							peasycap->audio_endpointnumber);
 					purb->transfer_flags = URB_ISO_ASAP;
-				purb->transfer_buffer =
-					peasycap->audio_isoc_buffer[isbuf].pgo;
-				purb->transfer_buffer_length =
-					peasycap->audio_isoc_buffer_size;
+					purb->transfer_buffer = peasycap->audio_isoc_buffer[isbuf].pgo;
+					purb->transfer_buffer_length = peasycap->audio_isoc_buffer_size;
 #ifdef CONFIG_EASYCAP_OSS
 					purb->complete = easyoss_complete;
 #else /* CONFIG_EASYCAP_OSS */
@@ -781,17 +770,10 @@ if (!peasycap->audio_isoc_streaming) {
 #endif /* CONFIG_EASYCAP_OSS */
 					purb->context = peasycap;
 					purb->start_frame = 0;
-				purb->number_of_packets =
-					peasycap->audio_isoc_framesperdesc;
-				for (j = 0;  j < peasycap->
-						audio_isoc_framesperdesc;
-									j++) {
-					purb->iso_frame_desc[j].offset = j *
-						peasycap->
-						audio_isoc_maxframesize;
-					purb->iso_frame_desc[j].length =
-						peasycap->
-						audio_isoc_maxframesize;
+					purb->number_of_packets = peasycap->audio_isoc_framesperdesc;
+					for (j = 0;  j < peasycap->audio_isoc_framesperdesc; j++) {
+						purb->iso_frame_desc[j].offset = j * peasycap->audio_isoc_maxframesize;
+						purb->iso_frame_desc[j].length = peasycap->audio_isoc_maxframesize;
 					}
 
 					rc = usb_submit_urb(purb, GFP_KERNEL);
@@ -818,8 +800,7 @@ if (!peasycap->audio_isoc_streaming) {
 		if (isbad) {
 			JOM(4, "attempting cleanup instead of submitting\n");
 			list_for_each(plist_head, (peasycap->purb_audio_head)) {
-			pdata_urb = list_entry(plist_head, struct data_urb,
-								list_head);
+				pdata_urb = list_entry(plist_head, struct data_urb, list_head);
 				if (NULL != pdata_urb) {
 					purb = pdata_urb->purb;
 					if (NULL != purb)
@@ -831,10 +812,10 @@ if (!peasycap->audio_isoc_streaming) {
 			peasycap->audio_isoc_streaming = m;
 			JOM(4, "submitted %i audio urbs\n", m);
 		}
-} else
+	} else
 		JOM(4, "already streaming audio urbs\n");
 
-return 0;
+	return 0;
 }
 /*****************************************************************************/
 /*---------------------------------------------------------------------------*/
@@ -845,22 +826,21 @@ return 0;
 int
 kill_audio_urbs(struct easycap *peasycap)
 {
-int m;
-struct list_head *plist_head;
-struct data_urb *pdata_urb;
+	int m;
+	struct list_head *plist_head;
+	struct data_urb *pdata_urb;
 
-if (NULL == peasycap) {
+	if (NULL == peasycap) {
 		SAY("ERROR: peasycap is NULL\n");
 		return -EFAULT;
-}
-if (peasycap->audio_isoc_streaming) {
+	}
+	if (peasycap->audio_isoc_streaming) {
 		if (NULL != peasycap->purb_audio_head) {
 			peasycap->audio_isoc_streaming = 0;
 			JOM(4, "killing audio urbs\n");
 			m = 0;
 			list_for_each(plist_head, (peasycap->purb_audio_head)) {
-			pdata_urb = list_entry(plist_head, struct data_urb,
-								list_head);
+				pdata_urb = list_entry(plist_head, struct data_urb, list_head);
 				if (NULL != pdata_urb) {
 					if (NULL != pdata_urb->purb) {
 						usb_kill_urb(pdata_urb->purb);
@@ -873,10 +853,10 @@ if (peasycap->audio_isoc_streaming) {
 			SAM("ERROR: peasycap->purb_audio_head is NULL\n");
 			return -EFAULT;
 		}
-} else {
+	} else {
 		JOM(8, "%i=audio_isoc_streaming, no audio urbs killed\n",
 		    peasycap->audio_isoc_streaming);
-}
-return 0;
+	}
+	return 0;
 }
 /*****************************************************************************/