github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-27 11:02:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: fsl: add card_to_mdata() macro

Browse Source 
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> says:

I will post Card capsuling patch.
To makes its review easy, adds card_to_mdata() and useit to reduce
un-related diff.
No functional change, but is preparation for cleanup driver.

Link: https://patch.msgid.link/877bmpjfjz.wl-kuninori.morimoto.gx@renesas.com
This commit is contained in:
Mark Brown 2026-07-22 15:52:50 +01:00
commit 51ecf42b24
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/fsl/p1022_ds.c
View File

@ -73,6 +73,8 @@ struct machine_data {
char platform_name[2][DAI_NAME_SIZE]; /* One for each DMA channel */
};
#define card_to_mdata(_card) container_of(_card, struct machine_data, card)
/**
* p1022_ds_machine_probe: initialize the board
*
@ -82,8 +84,7 @@ struct machine_data {
*/
static int p1022_ds_machine_probe(struct snd_soc_card *card)
{
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(card);
struct ccsr_guts __iomem *guts;
guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
@ -122,8 +123,7 @@ static int p1022_ds_machine_probe(struct snd_soc_card *card)
static int p1022_ds_startup(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct machine_data *mdata =
container_of(rtd->card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(rtd->card);
struct device *dev = rtd->card->dev;
int ret = 0;
@ -156,8 +156,7 @@ static int p1022_ds_startup(struct snd_pcm_substream *substream)
*/
static int p1022_ds_machine_remove(struct snd_soc_card *card)
{
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(card);
struct ccsr_guts __iomem *guts;
guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
@ -399,8 +398,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
static void p1022_ds_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(card);
snd_soc_unregister_card(card);
kfree(mdata);

14
sound/soc/fsl/p1022_rdk.c
View File

@ -79,6 +79,8 @@ struct machine_data {
char platform_name[2][DAI_NAME_SIZE]; /* One for each DMA channel */
};
#define card_to_mdata(_card) container_of(_card, struct machine_data, card)
/**
* p1022_rdk_machine_probe - initialize the board
* @card: ASoC card instance
@ -91,8 +93,7 @@ struct machine_data {
*/
static int p1022_rdk_machine_probe(struct snd_soc_card *card)
{
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(card);
struct ccsr_guts __iomem *guts;
guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
@ -134,8 +135,7 @@ static int p1022_rdk_machine_probe(struct snd_soc_card *card)
static int p1022_rdk_startup(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct machine_data *mdata =
container_of(rtd->card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(rtd->card);
struct device *dev = rtd->card->dev;
int ret = 0;
@ -169,8 +169,7 @@ static int p1022_rdk_startup(struct snd_pcm_substream *substream)
*/
static int p1022_rdk_machine_remove(struct snd_soc_card *card)
{
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(card);
struct ccsr_guts __iomem *guts;
guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
@ -361,8 +360,7 @@ static int p1022_rdk_probe(struct platform_device *pdev)
static void p1022_rdk_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct machine_data *mdata = card_to_mdata(card);
snd_soc_unregister_card(card);
kfree(mdata);