Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai

[~andy/linux] / include / sound / pcm.h

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 84b10f9a28324951a2a56d1cc89df9d50e0623bb..4883499ab38b07834dc6b4ee3fe085bf93b0efdf 100644 (file)
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -381,7 +381,6 @@ struct snd_pcm_substream {
        struct pm_qos_request latency_pm_qos_req; /* pm_qos request */
        size_t buffer_bytes_max;        /* limit ring buffer size */
        struct snd_dma_buffer dma_buffer;
-       unsigned int dma_buf_id;
        size_t dma_max;
        /* -- hardware operations -- */
        const struct snd_pcm_ops *ops;
@@ -901,6 +900,8 @@ extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates;
 int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);
 unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);
 unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit);
+unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,
+                                        unsigned int rates_b);
 
 static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream,
                                              struct snd_dma_buffer *bufp)