.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * Copyright (C) STMicroelectronics SA 2015 |
---|
3 | 4 | * Authors: Arnaud Pouliquen <arnaud.pouliquen@st.com> |
---|
4 | 5 | * for STMicroelectronics. |
---|
5 | | - * License terms: GNU General Public License (GPL), version 2 |
---|
6 | 6 | */ |
---|
7 | 7 | |
---|
8 | 8 | #include <linux/module.h> |
---|
.. | .. |
---|
308 | 308 | return 0; |
---|
309 | 309 | } |
---|
310 | 310 | |
---|
311 | | -static int sti_uniperiph_dai_suspend(struct snd_soc_dai *dai) |
---|
| 311 | +static int sti_uniperiph_suspend(struct snd_soc_component *component) |
---|
312 | 312 | { |
---|
313 | | - struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai); |
---|
| 313 | + struct sti_uniperiph_data *priv = snd_soc_component_get_drvdata(component); |
---|
314 | 314 | struct uniperif *uni = priv->dai_data.uni; |
---|
315 | 315 | int ret; |
---|
316 | 316 | |
---|
.. | .. |
---|
330 | 330 | return ret; |
---|
331 | 331 | } |
---|
332 | 332 | |
---|
333 | | -static int sti_uniperiph_dai_resume(struct snd_soc_dai *dai) |
---|
| 333 | +static int sti_uniperiph_resume(struct snd_soc_component *component) |
---|
334 | 334 | { |
---|
335 | | - struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai); |
---|
| 335 | + struct sti_uniperiph_data *priv = snd_soc_component_get_drvdata(component); |
---|
336 | 336 | struct uniperif *uni = priv->dai_data.uni; |
---|
337 | 337 | int ret; |
---|
338 | 338 | |
---|
.. | .. |
---|
370 | 370 | |
---|
371 | 371 | static const struct snd_soc_dai_driver sti_uniperiph_dai_template = { |
---|
372 | 372 | .probe = sti_uniperiph_dai_probe, |
---|
373 | | - .suspend = sti_uniperiph_dai_suspend, |
---|
374 | | - .resume = sti_uniperiph_dai_resume |
---|
375 | 373 | }; |
---|
376 | 374 | |
---|
377 | 375 | static const struct snd_soc_component_driver sti_uniperiph_dai_component = { |
---|
378 | 376 | .name = "sti_cpu_dai", |
---|
| 377 | + .suspend = sti_uniperiph_suspend, |
---|
| 378 | + .resume = sti_uniperiph_resume |
---|
379 | 379 | }; |
---|
380 | 380 | |
---|
381 | 381 | static int sti_uniperiph_cpu_dai_of(struct device_node *node, |
---|
.. | .. |
---|
426 | 426 | UNIPERIF_FIFO_DATA_OFFSET(uni); |
---|
427 | 427 | |
---|
428 | 428 | uni->irq = platform_get_irq(priv->pdev, 0); |
---|
429 | | - if (uni->irq < 0) { |
---|
430 | | - dev_err(dev, "Failed to get IRQ resource\n"); |
---|
| 429 | + if (uni->irq < 0) |
---|
431 | 430 | return -ENXIO; |
---|
432 | | - } |
---|
433 | 431 | |
---|
434 | 432 | uni->type = dev_data->type; |
---|
435 | 433 | |
---|