V4L/DVB (10955): cx231xx: CodingStyle automatic fixes with Lindent (84b5dbf3) · Commits · 戴 / test

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

+129 −126

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ static int cx231xx_isoc_audio_deinit(struct cx231xx *dev)

		dprintk("Stopping isoc\n");


		for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
		if (dev->adev.urb[i]) {
		if (!irqs_disabled())
		@@ -145,7 +144,6 @@ static void cx231xx_audio_isocirq(struct urb *urb)
		runtime->period_size;
		period_elapsed = 1;
		}

		snd_pcm_stream_unlock(substream);
		}
		if (period_elapsed)
		@@ -191,7 +189,8 @@ 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;
		@@ -202,8 +201,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)
		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;
		urb->iso_frame_desc[j].length = dev->adev.max_pkt_size;
		}
		dev->adev.urb[i] = urb;
		}
		@@ -266,8 +264,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
		static struct snd_pcm_hardware snd_cx231xx_hw_capture = {
		.info = SNDRV_PCM_INFO_BLOCK_TRANSFER \|
		SNDRV_PCM_INFO_MMAP \|
		SNDRV_PCM_INFO_INTERLEAVED \|
		SNDRV_PCM_INFO_MMAP_VALID,
		SNDRV_PCM_INFO_INTERLEAVED \| SNDRV_PCM_INFO_MMAP_VALID,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,

		@@ -330,7 +327,6 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
		int ret;
		struct cx231xx *dev = snd_pcm_substream_chip(substream);


		dprintk("closing device\n");

		/* set alternate setting for audio interface */
		@@ -402,14 +398,14 @@ static int snd_cx231xx_capture_trigger(struct snd_pcm_substream *substream,
		struct cx231xx *dev = snd_pcm_substream_chip(substream);
		int retval;


		dprintk("Should %s capture\n", (cmd == SNDRV_PCM_TRIGGER_START) ?
		"start" : "stop");

		spin_lock(&dev->adev.slock);
		switch (cmd) {
		case SNDRV_PCM_TRIGGER_START:
		cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN, CX231XX_START_AUDIO);
		cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN,
		CX231XX_START_AUDIO);
		retval = 0;
		break;
		case SNDRV_PCM_TRIGGER_STOP:
		@@ -492,7 +488,8 @@ static int cx231xx_audio_init(struct cx231xx *dev)
		return err;
		}

		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_cx231xx_pcm_capture);
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
		&snd_cx231xx_pcm_capture);
		pcm->info_flags = 0;
		pcm->private_data = dev;
		strcpy(pcm->name, "Conexant cx231xx Capture");
		@@ -509,13 +506,18 @@ static int cx231xx_audio_init(struct cx231xx *dev)
		adev->udev = dev->udev;

		/* compute alternate max packet sizes for Audio */
		uif = dev->udev->actconfig->interface[dev->current_pcb_config.hs_config_info[0].interface_info.audio_index+1];
		uif =
		dev->udev->actconfig->interface[dev->current_pcb_config.
		hs_config_info[0].interface_info.
		audio_index + 1];

		adev->end_point_addr = le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress);
		adev->end_point_addr =
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
		bEndpointAddress);

		adev->num_alt = uif->num_altsetting;
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n", adev->end_point_addr,
		adev->num_alt);
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n",
		adev->end_point_addr, adev->num_alt);
		adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);

		if (adev->alt_max_pkt_size == NULL) {
		@@ -524,7 +526,8 @@ static int cx231xx_audio_init(struct cx231xx *dev)
		}

		for (i = 0; i < adev->num_alt; i++) {
		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		u16 tmp =
		le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		wMaxPacketSize);
		adev->alt_max_pkt_size[i] =
		(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

Admin message