Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc/topic/zx296702' into asoc-next
This commit is contained in:
commit
91931320cf
|
@ -2647,12 +2647,10 @@ static int wm8996_probe(struct snd_soc_codec *codec)
|
|||
if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
|
||||
ret = request_threaded_irq(i2c->irq, NULL,
|
||||
wm8996_edge_irq,
|
||||
irq_flags | IRQF_ONESHOT,
|
||||
"wm8996", codec);
|
||||
irq_flags, "wm8996", codec);
|
||||
else
|
||||
ret = request_threaded_irq(i2c->irq, NULL, wm8996_irq,
|
||||
irq_flags | IRQF_ONESHOT,
|
||||
"wm8996", codec);
|
||||
irq_flags, "wm8996", codec);
|
||||
|
||||
if (ret == 0) {
|
||||
/* Unmask the interrupt */
|
||||
|
|
|
@ -75,7 +75,7 @@ struct xtfpga_i2s {
|
|||
* stream in the pcm_close callback it synchronizes with the interrupt
|
||||
* handler by means of synchronize_rcu call.
|
||||
*/
|
||||
struct snd_pcm_substream *tx_substream;
|
||||
struct snd_pcm_substream __rcu *tx_substream;
|
||||
unsigned (*tx_fn)(struct xtfpga_i2s *i2s,
|
||||
struct snd_pcm_runtime *runtime,
|
||||
unsigned tx_ptr);
|
||||
|
@ -474,11 +474,6 @@ static int xtfpga_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
|||
card->dev, size, size);
|
||||
}
|
||||
|
||||
static void xtfpga_pcm_free(struct snd_pcm *pcm)
|
||||
{
|
||||
snd_pcm_lib_preallocate_free_for_all(pcm);
|
||||
}
|
||||
|
||||
static const struct snd_pcm_ops xtfpga_pcm_ops = {
|
||||
.open = xtfpga_pcm_open,
|
||||
.close = xtfpga_pcm_close,
|
||||
|
@ -490,7 +485,6 @@ static const struct snd_pcm_ops xtfpga_pcm_ops = {
|
|||
|
||||
static const struct snd_soc_platform_driver xtfpga_soc_platform = {
|
||||
.pcm_new = xtfpga_pcm_new,
|
||||
.pcm_free = xtfpga_pcm_free,
|
||||
.ops = &xtfpga_pcm_ops,
|
||||
};
|
||||
|
||||
|
|
|
@ -380,7 +380,7 @@ static int zx_i2s_probe(struct platform_device *pdev)
|
|||
struct zx_i2s_info *zx_i2s;
|
||||
int ret;
|
||||
|
||||
zx_i2s = kzalloc(sizeof(*zx_i2s), GFP_KERNEL);
|
||||
zx_i2s = devm_kzalloc(&pdev->dev, sizeof(*zx_i2s), GFP_KERNEL);
|
||||
if (!zx_i2s)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -401,8 +401,8 @@ static int zx_i2s_probe(struct platform_device *pdev)
|
|||
writel_relaxed(0, zx_i2s->reg_base + ZX_I2S_FIFO_CTRL);
|
||||
platform_set_drvdata(pdev, zx_i2s);
|
||||
|
||||
ret = snd_soc_register_component(&pdev->dev, &zx_i2s_component,
|
||||
&zx_i2s_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&pdev->dev, &zx_i2s_component,
|
||||
&zx_i2s_dai, 1);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Register DAI failed: %d\n", ret);
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue