Unverified Commit d83fa234 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: qdsp6: fix some warnings when build without CONFIG_OF"... 

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
parents 7e6799d8 5d0576bb

sound/soc/qcom/qdsp6/q6adm.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

sound/soc/qcom/qdsp6/q6afe-clocks.c

+2 −0
Original line number Diff line number Diff line
@@ -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 = {

sound/soc/qcom/qdsp6/q6afe-dai.c

+2 −0
Original line number Diff line number Diff line
@@ -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 = {

sound/soc/qcom/qdsp6/q6afe.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

sound/soc/qcom/qdsp6/q6asm-dai.c

+2 −0
Original line number Diff line number Diff line
@@ -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 = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE