9ae0d92f86
[ Upstream commit 3c27ea23ffb43262da6c64964163895951aaed4e ] On Linux 5.9-rc1 I get the following warning with apq8016-sbc: WARNING: CPU: 2 PID: 69 at sound/core/init.c:207 snd_card_new+0x36c/0x3b0 [snd] CPU: 2 PID: 69 Comm: kworker/2:1 Not tainted 5.9.0-rc1 #1 Workqueue: events deferred_probe_work_func pc : snd_card_new+0x36c/0x3b0 [snd] lr : snd_card_new+0xf4/0x3b0 [snd] Call trace: snd_card_new+0x36c/0x3b0 [snd] snd_soc_bind_card+0x340/0x9a0 [snd_soc_core] snd_soc_register_card+0xf4/0x110 [snd_soc_core] devm_snd_soc_register_card+0x44/0xa0 [snd_soc_core] apq8016_sbc_platform_probe+0x11c/0x140 [snd_soc_apq8016_sbc] This warning was introduced in commit 81033c6b584b ("ALSA: core: Warn on empty module"). It looks like we are supposed to set card->owner to THIS_MODULE. Fix this for all the qcom ASoC drivers. Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Fixes:79119c7986("ASoC: qcom: Add Storm machine driver") Fixes:bdb052e81f("ASoC: qcom: add apq8016 sound card support") Fixes:a6f933f63f("ASoC: qcom: apq8096: Add db820c machine driver") Fixes:6b1687bf76("ASoC: qcom: add sdm845 sound card support") Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Link: https://lore.kernel.org/r/20200820154511.203072-1-stephan@gerhold.net Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
100 lines
2.2 KiB
C
100 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
// Copyright (c) 2018, Linaro Limited
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of_device.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-dapm.h>
|
|
#include <sound/pcm.h>
|
|
#include "common.h"
|
|
|
|
static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_interval *rate = hw_param_interval(params,
|
|
SNDRV_PCM_HW_PARAM_RATE);
|
|
struct snd_interval *channels = hw_param_interval(params,
|
|
SNDRV_PCM_HW_PARAM_CHANNELS);
|
|
|
|
rate->min = rate->max = 48000;
|
|
channels->min = channels->max = 2;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void apq8096_add_be_ops(struct snd_soc_card *card)
|
|
{
|
|
struct snd_soc_dai_link *link = card->dai_link;
|
|
int i, num_links = card->num_links;
|
|
|
|
for (i = 0; i < num_links; i++) {
|
|
if (link->no_pcm == 1)
|
|
link->be_hw_params_fixup = apq8096_be_hw_params_fixup;
|
|
link++;
|
|
}
|
|
}
|
|
|
|
static int apq8096_platform_probe(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card;
|
|
struct device *dev = &pdev->dev;
|
|
int ret;
|
|
|
|
card = kzalloc(sizeof(*card), GFP_KERNEL);
|
|
if (!card)
|
|
return -ENOMEM;
|
|
|
|
card->dev = dev;
|
|
card->owner = THIS_MODULE;
|
|
dev_set_drvdata(dev, card);
|
|
ret = qcom_snd_parse_of(card);
|
|
if (ret) {
|
|
dev_err(dev, "Error parsing OF data\n");
|
|
goto err;
|
|
}
|
|
|
|
apq8096_add_be_ops(card);
|
|
ret = snd_soc_register_card(card);
|
|
if (ret)
|
|
goto err_card_register;
|
|
|
|
return 0;
|
|
|
|
err_card_register:
|
|
kfree(card->dai_link);
|
|
err:
|
|
kfree(card);
|
|
return ret;
|
|
}
|
|
|
|
static int apq8096_platform_remove(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card = dev_get_drvdata(&pdev->dev);
|
|
|
|
snd_soc_unregister_card(card);
|
|
kfree(card->dai_link);
|
|
kfree(card);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id msm_snd_apq8096_dt_match[] = {
|
|
{.compatible = "qcom,apq8096-sndcard"},
|
|
{}
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, msm_snd_apq8096_dt_match);
|
|
|
|
static struct platform_driver msm_snd_apq8096_driver = {
|
|
.probe = apq8096_platform_probe,
|
|
.remove = apq8096_platform_remove,
|
|
.driver = {
|
|
.name = "msm-snd-apq8096",
|
|
.of_match_table = msm_snd_apq8096_dt_match,
|
|
},
|
|
};
|
|
module_platform_driver(msm_snd_apq8096_driver);
|
|
MODULE_AUTHOR("Srinivas Kandagatla <srinivas.kandagatla@linaro.org");
|
|
MODULE_DESCRIPTION("APQ8096 ASoC Machine Driver");
|
|
MODULE_LICENSE("GPL v2");
|