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

Commit b83f346b authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] remove incorrect usage of SNDRV_PCM_INFO_SYNC_START and snd_pcm_set_sync() 



Set the SNDRV_PCM_INFO_SYNC_START flag and the substream's sync ID
(only) if the substream actually can be linked to another one.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent f9ff161a

sound/isa/ad1816a/ad1816a_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ static int snd_ad1816a_playback_open(struct snd_pcm_substream *substream) 


	if ((error = snd_ad1816a_open(chip, AD1816A_MODE_PLAYBACK)) < 0)

		return error;

	snd_pcm_set_sync(substream);

	runtime->hw = snd_ad1816a_playback;

	snd_pcm_limit_isa_dma_size(chip->dma1, &runtime->hw.buffer_bytes_max);

	snd_pcm_limit_isa_dma_size(chip->dma1, &runtime->hw.period_bytes_max);
@@ -469,7 +468,6 @@ static int snd_ad1816a_capture_open(struct snd_pcm_substream *substream) 


	if ((error = snd_ad1816a_open(chip, AD1816A_MODE_CAPTURE)) < 0)

		return error;

	snd_pcm_set_sync(substream);

	runtime->hw = snd_ad1816a_capture;

	snd_pcm_limit_isa_dma_size(chip->dma2, &runtime->hw.buffer_bytes_max);

	snd_pcm_limit_isa_dma_size(chip->dma2, &runtime->hw.period_bytes_max);

sound/pci/ca0106/ca0106_main.c

+6 −4
Original line number Diff line number Diff line
@@ -274,10 +274,11 @@ static struct snd_ca0106_details ca0106_chip_details[] = { 


/* hardware definition */

static struct snd_pcm_hardware snd_ca0106_playback_hw = {

	.info =			(SNDRV_PCM_INFO_MMAP | 

	.info =			SNDRV_PCM_INFO_MMAP | 

				SNDRV_PCM_INFO_INTERLEAVED |

				SNDRV_PCM_INFO_BLOCK_TRANSFER |

				 SNDRV_PCM_INFO_MMAP_VALID),

				SNDRV_PCM_INFO_MMAP_VALID |

				SNDRV_PCM_INFO_SYNC_START,

	.formats =		SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,

	.rates =		(SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000),
@@ -507,6 +508,7 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr 
                return err;

	if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)

                return err;

	snd_pcm_set_sync(substream);



	if (chip->details->spi_dac && channel_id != PCM_FRONT_CHANNEL) {

		const int reg = spi_dacd_reg[channel_id];

sound/pci/cs4281.c

+10 −14
Original line number Diff line number Diff line
@@ -842,12 +842,11 @@ static snd_pcm_uframes_t snd_cs4281_pointer(struct snd_pcm_substream *substream) 


static struct snd_pcm_hardware snd_cs4281_playback =

{

	.info =			(SNDRV_PCM_INFO_MMAP |

	.info =			SNDRV_PCM_INFO_MMAP |

				SNDRV_PCM_INFO_INTERLEAVED |

				SNDRV_PCM_INFO_MMAP_VALID |

				SNDRV_PCM_INFO_PAUSE |

				 SNDRV_PCM_INFO_RESUME |

				 SNDRV_PCM_INFO_SYNC_START),

				SNDRV_PCM_INFO_RESUME,

	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |

				SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE |

				SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
@@ -868,12 +867,11 @@ static struct snd_pcm_hardware snd_cs4281_playback = 


static struct snd_pcm_hardware snd_cs4281_capture =

{

	.info =			(SNDRV_PCM_INFO_MMAP |

	.info =			SNDRV_PCM_INFO_MMAP |

				SNDRV_PCM_INFO_INTERLEAVED |

				SNDRV_PCM_INFO_MMAP_VALID |

				SNDRV_PCM_INFO_PAUSE |

				 SNDRV_PCM_INFO_RESUME |

				 SNDRV_PCM_INFO_SYNC_START),

				SNDRV_PCM_INFO_RESUME,

	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |

				SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE |

				SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
@@ -904,7 +902,6 @@ static int snd_cs4281_playback_open(struct snd_pcm_substream *substream) 
	dma->right_slot = 1;

	runtime->private_data = dma;

	runtime->hw = snd_cs4281_playback;

	snd_pcm_set_sync(substream);

	/* should be detected from the AC'97 layer, but it seems

	   that although CS4297A rev B reports 18-bit ADC resolution,

	   samples are 20-bit */
@@ -924,7 +921,6 @@ static int snd_cs4281_capture_open(struct snd_pcm_substream *substream) 
	dma->right_slot = 11;

	runtime->private_data = dma;

	runtime->hw = snd_cs4281_capture;

	snd_pcm_set_sync(substream);

	/* should be detected from the AC'97 layer, but it seems

	   that although CS4297A rev B reports 18-bit ADC resolution,

	   samples are 20-bit */

sound/pci/cs5535audio/cs5535audio_pcm.c

+1 −5
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static struct snd_pcm_hardware snd_cs5535audio_playback = 
		 		SNDRV_PCM_INFO_BLOCK_TRANSFER |

		 		SNDRV_PCM_INFO_MMAP_VALID |

		 		SNDRV_PCM_INFO_PAUSE |

				SNDRV_PCM_INFO_SYNC_START |

				SNDRV_PCM_INFO_RESUME

				),

	.formats =		(
@@ -71,8 +70,7 @@ static struct snd_pcm_hardware snd_cs5535audio_capture = 
				SNDRV_PCM_INFO_MMAP |

				SNDRV_PCM_INFO_INTERLEAVED |

		 		SNDRV_PCM_INFO_BLOCK_TRANSFER |

		 		SNDRV_PCM_INFO_MMAP_VALID |

				SNDRV_PCM_INFO_SYNC_START

		 		SNDRV_PCM_INFO_MMAP_VALID

				),

	.formats =		(

				SNDRV_PCM_FMTBIT_S16_LE
@@ -102,7 +100,6 @@ static int snd_cs5535audio_playback_open(struct snd_pcm_substream *substream) 
	runtime->hw = snd_cs5535audio_playback;

	cs5535au->playback_substream = substream;

	runtime->private_data = &(cs5535au->dmas[CS5535AUDIO_DMA_PLAYBACK]);

	snd_pcm_set_sync(substream);

	if ((err = snd_pcm_hw_constraint_integer(runtime,

				SNDRV_PCM_HW_PARAM_PERIODS)) < 0)

		return err;
@@ -348,7 +345,6 @@ static int snd_cs5535audio_capture_open(struct snd_pcm_substream *substream) 
	runtime->hw = snd_cs5535audio_capture;

	cs5535au->capture_substream = substream;

	runtime->private_data = &(cs5535au->dmas[CS5535AUDIO_DMA_CAPTURE]);

	snd_pcm_set_sync(substream);

	if ((err = snd_pcm_hw_constraint_integer(runtime,

					 SNDRV_PCM_HW_PARAM_PERIODS)) < 0)

		return err;

sound/pci/emu10k1/p16v.c

+11 −5
Original line number Diff line number Diff line
@@ -124,11 +124,12 @@ 


 /* hardware definition */

static struct snd_pcm_hardware snd_p16v_playback_hw = {

	.info =			(SNDRV_PCM_INFO_MMAP | 

	.info =			SNDRV_PCM_INFO_MMAP | 

				SNDRV_PCM_INFO_INTERLEAVED |

				SNDRV_PCM_INFO_BLOCK_TRANSFER |

				SNDRV_PCM_INFO_RESUME |

				 SNDRV_PCM_INFO_MMAP_VALID),

				SNDRV_PCM_INFO_MMAP_VALID |

				SNDRV_PCM_INFO_SYNC_START,

	.formats =		SNDRV_PCM_FMTBIT_S32_LE, /* Only supports 24-bit samples padded to 32 bits. */

	.rates =		SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100, 

	.rate_min =		44100,
@@ -207,6 +208,11 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substrea 
	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)

                return err;



	runtime->sync.id32[0] = substream->pcm->card->number;

	runtime->sync.id32[1] = 'P';

	runtime->sync.id32[2] = 16;

	runtime->sync.id32[3] = 'V';



	return 0;

}

/* open_capture callback */