Unverified Commit 1793936b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: add soc-card.c 



Current ALSA SoC has some snd_soc_card_xxx() functions,
and card->xxx() callbacks.
But, it is implemented randomly at random place.

To collect all card related functions into one place,
this patch creats new soc-card.c.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87blm825kt.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 317ec675

include/sound/soc-card.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0

 *

 * soc-card.h

 *

 * Copyright (C) 2019 Renesas Electronics Corp.

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 */

#ifndef __SOC_CARD_H

#define __SOC_CARD_H



#endif /* __SOC_CARD_H */

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -1450,5 +1450,6 @@ static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm) 
}



#include <sound/soc-component.h>

#include <sound/soc-card.h>



#endif

sound/soc/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o

snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o soc-link.o

snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o soc-link.o soc-card.o

snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o



ifneq ($(CONFIG_SND_SOC_TOPOLOGY),)

sound/soc/soc-card.c

0 → 100644
+26 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// soc-card.c

//

// Copyright (C) 2019 Renesas Electronics Corp.

// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

//

#include <sound/soc.h>



#define soc_card_ret(dai, ret) _soc_card_ret(dai, __func__, ret)

static inline int _soc_card_ret(struct snd_soc_card *card,

				const char *func, int ret)

{

	switch (ret) {

	case -EPROBE_DEFER:

	case -ENOTSUPP:

	case 0:

		break;

	default:

		dev_err(card->dev,

			"ASoC: error at %s on %s: %d\n",

			func, card->name, ret);

	}



	return ret;

}