Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cde4362f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (10956): cx231xx: First series of manual CodingStyle fixes 



This patch cleans up CodingStyle on the following source files:

There are still much more to be fixed on later patches

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 84b5dbf3

drivers/media/video/cx231xx/cx231xx-audio.c

+15 −22
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static int cx231xx_isoc_audio_deinit(struct cx231xx *dev) 


			kfree(dev->adev.transfer_buffer[i]);

			dev->adev.transfer_buffer[i] = NULL;



		}

	}
@@ -108,8 +107,8 @@ static void cx231xx_audio_isocirq(struct urb *urb) 
		stride = runtime->frame_bits >> 3;



		for (i = 0; i < urb->number_of_packets; i++) {

			int length =

			    urb->iso_frame_desc[i].actual_length / stride;

			int length = urb->iso_frame_desc[i].actual_length /

				     stride;

			cp = (unsigned char *)urb->transfer_buffer +

					      urb->iso_frame_desc[i].offset;
@@ -118,8 +117,9 @@ static void cx231xx_audio_isocirq(struct urb *urb) 


			oldptr = dev->adev.hwptr_done_capture;

			if (oldptr + length >= runtime->buffer_size) {

				unsigned int cnt =

				    runtime->buffer_size - oldptr;

				unsigned int cnt;



				cnt = runtime->buffer_size - oldptr;

				memcpy(runtime->dma_area + oldptr * stride, cp,

				       cnt * stride);

				memcpy(runtime->dma_area, cp + cnt * stride,
@@ -132,16 +132,12 @@ static void cx231xx_audio_isocirq(struct urb *urb) 
			snd_pcm_stream_lock(substream);



			dev->adev.hwptr_done_capture += length;

			if (dev->adev.hwptr_done_capture >=

			    runtime->buffer_size)

				dev->adev.hwptr_done_capture -=

				    runtime->buffer_size;

			if (dev->adev.hwptr_done_capture >= runtime->buffer_size)

				dev->adev.hwptr_done_capture -= runtime->buffer_size;



			dev->adev.capture_transfer_done += length;

			if (dev->adev.capture_transfer_done >=

			    runtime->period_size) {

				dev->adev.capture_transfer_done -=

				    runtime->period_size;

			if (dev->adev.capture_transfer_done >= runtime->period_size) {

				dev->adev.capture_transfer_done -= runtime->period_size;

				period_elapsed = 1;

			}

			snd_pcm_stream_unlock(substream);
@@ -189,8 +185,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) 


		urb->dev = dev->udev;

		urb->context = dev;

		urb->pipe =

		    usb_rcvisocpipe(dev->udev, dev->adev.end_point_addr);

		urb->pipe = usb_rcvisocpipe(dev->udev, dev->adev.end_point_addr);

		urb->transfer_flags = URB_ISO_ASAP;

		urb->transfer_buffer = dev->adev.transfer_buffer[i];

		urb->interval = 1;
@@ -198,8 +193,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) 
		urb->number_of_packets = CX231XX_NUM_AUDIO_PACKETS;

		urb->transfer_buffer_length = sb_size;



		for (j = k = 0; j < CX231XX_NUM_AUDIO_PACKETS;

		     j++, k += dev->adev.max_pkt_size) {

		for (j = k = 0; j < CX231XX_NUM_AUDIO_PACKETS; j++, k += dev->adev.max_pkt_size) {

			urb->iso_frame_desc[j].offset = k;

			urb->iso_frame_desc[j].length = dev->adev.max_pkt_size;

		}
@@ -477,9 +471,8 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
		     "non standard usbaudio\n");



	card = snd_card_new(index[devnr], "Cx231xx Audio", THIS_MODULE, 0);

	if (card == NULL) {

	if (card == NULL)

		return -ENOMEM;

	}



	spin_lock_init(&adev->slock);

	err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm);