Merge series "ASoC: qdsp6: fix some warnings when build without CONFIG_OF" from Srinivas Kandagatla <srinivas.kandagatla@linaro.org>:
Here are fixes for two warnings types discovered while building qdsp6 drivers without CONFIG_OF and with W=1 One of them was reported by Intel kernel test robot on q6afe-clocks patch, which equally applies to rest of the qdsp6 drivers. changes since v1: - added ifdef CONFIG_OF instead of removing of_match_ptr Srinivas Kandagatla (2): ASoC: qdsp6: add ifdef CONFIG_OF around of_device_id ASoC: q6asm: fix kernel doc warnings sound/soc/qcom/qdsp6/q6adm.c | 2 ++ sound/soc/qcom/qdsp6/q6afe-clocks.c | 2 ++ sound/soc/qcom/qdsp6/q6afe-dai.c | 2 ++ sound/soc/qcom/qdsp6/q6afe.c | 2 ++ sound/soc/qcom/qdsp6/q6asm-dai.c | 2 ++ sound/soc/qcom/qdsp6/q6asm.c | 6 ++++++ sound/soc/qcom/qdsp6/q6core.c | 2 ++ sound/soc/qcom/qdsp6/q6routing.c | 2 ++ 8 files changed, 20 insertions(+) -- 2.21.0
This commit is contained in:
commit
d83fa234ae
@ -611,11 +611,13 @@ static int q6adm_remove(struct apr_device *adev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6adm_device_id[] = {
|
||||
{ .compatible = "qcom,q6adm" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6adm_device_id);
|
||||
#endif
|
||||
|
||||
static struct apr_driver qcom_q6adm_driver = {
|
||||
.probe = q6adm_probe,
|
||||
|
@ -251,11 +251,13 @@ static int q6afe_clock_dev_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6afe_clock_device_id[] = {
|
||||
{ .compatible = "qcom,q6afe-clocks" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6afe_clock_device_id);
|
||||
#endif
|
||||
|
||||
static struct platform_driver q6afe_clock_platform_driver = {
|
||||
.driver = {
|
||||
|
@ -1689,11 +1689,13 @@ static int q6afe_dai_dev_probe(struct platform_device *pdev)
|
||||
q6afe_dais, ARRAY_SIZE(q6afe_dais));
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6afe_dai_device_id[] = {
|
||||
{ .compatible = "qcom,q6afe-dais" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6afe_dai_device_id);
|
||||
#endif
|
||||
|
||||
static struct platform_driver q6afe_dai_platform_driver = {
|
||||
.driver = {
|
||||
|
@ -1750,11 +1750,13 @@ static int q6afe_remove(struct apr_device *adev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6afe_device_id[] = {
|
||||
{ .compatible = "qcom,q6afe" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6afe_device_id);
|
||||
#endif
|
||||
|
||||
static struct apr_driver qcom_q6afe_driver = {
|
||||
.probe = q6afe_probe,
|
||||
|
@ -1334,11 +1334,13 @@ static int q6asm_dai_probe(struct platform_device *pdev)
|
||||
pdata->dais, pdata->num_dais);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6asm_dai_device_id[] = {
|
||||
{ .compatible = "qcom,q6asm-dais" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6asm_dai_device_id);
|
||||
#endif
|
||||
|
||||
static struct platform_driver q6asm_dai_platform_driver = {
|
||||
.driver = {
|
||||
|
@ -915,9 +915,11 @@ err:
|
||||
/**
|
||||
* q6asm_open_write() - Open audio client for writing
|
||||
* @ac: audio client pointer
|
||||
* @stream_id: stream id of q6asm session
|
||||
* @format: audio sample format
|
||||
* @codec_profile: compressed format profile
|
||||
* @bits_per_sample: bits per sample
|
||||
* @is_gapless: flag to indicate if this is a gapless stream
|
||||
*
|
||||
* Return: Will be an negative value on error or zero on success
|
||||
*/
|
||||
@ -1042,6 +1044,7 @@ static int __q6asm_run(struct audio_client *ac, uint32_t stream_id,
|
||||
* q6asm_run() - start the audio client
|
||||
*
|
||||
* @ac: audio client pointer
|
||||
* @stream_id: stream id of q6asm session
|
||||
* @flags: flags associated with write
|
||||
* @msw_ts: timestamp msw
|
||||
* @lsw_ts: timestamp lsw
|
||||
@ -1733,11 +1736,14 @@ static int q6asm_remove(struct apr_device *adev)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6asm_device_id[] = {
|
||||
{ .compatible = "qcom,q6asm" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6asm_device_id);
|
||||
#endif
|
||||
|
||||
static struct apr_driver qcom_q6asm_driver = {
|
||||
.probe = q6asm_probe,
|
||||
|
@ -354,11 +354,13 @@ static int q6core_exit(struct apr_device *adev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6core_device_id[] = {
|
||||
{ .compatible = "qcom,q6core" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6core_device_id);
|
||||
#endif
|
||||
|
||||
static struct apr_driver qcom_q6core_driver = {
|
||||
.probe = q6core_probe,
|
||||
|
@ -1143,11 +1143,13 @@ static int q6pcm_routing_remove(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id q6pcm_routing_device_id[] = {
|
||||
{ .compatible = "qcom,q6adm-routing" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, q6pcm_routing_device_id);
|
||||
#endif
|
||||
|
||||
static struct platform_driver q6pcm_routing_platform_driver = {
|
||||
.driver = {
|
||||
|
Loading…
Reference in New Issue
Block a user