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

Merge series "ASoC: codecs: wm/cs: fix kernel-doc and W=1 warnings" from... 

Merge series "ASoC: codecs: wm/cs: fix kernel-doc and W=1 warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

I've been doing a lot of cleanups to get to zero warnings with W=1,
here's the first batch for Cirrus/Wolfson codecs.

Pierre-Louis Bossart (7):
  ASoC: codecs: cs4270: fix kernel-doc
  ASoC: codecs: cs42l42: remove always-true comparisons
  ASoC: codecs: wm8986: fix missing kernel-doc arguments
  ASoC: codecs: wm8960: fix kernel-doc
  ASoC: codecs: wm9713: remove spurious kernel-doc comment start
  ASoC: codecs: wm8994: fix kernel-doc
  ASoC: codecs: wm8400: add _maybe_unused as needed

 sound/soc/codecs/cs4270.c  | 4 ++--
 sound/soc/codecs/cs42l42.c | 9 +++------
 sound/soc/codecs/wm8400.c  | 6 +++---
 sound/soc/codecs/wm8960.c  | 2 +-
 sound/soc/codecs/wm8994.c  | 4 ++++
 sound/soc/codecs/wm8996.c  | 3 +++
 sound/soc/codecs/wm9713.c  | 2 +-
 7 files changed, 17 insertions(+), 13 deletions(-)

base-commit: a2b782d5
--
2.25.1
parents 8a78439a 7c4084e1

sound/soc/codecs/cs4270.c

+2 −2
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static struct snd_soc_dai_driver cs4270_dai = { 


/**

 * cs4270_probe - ASoC probe function

 * @pdev: platform device

 * @component: ASoC component

 *

 * This function is called when ASoC has all the pieces it needs to

 * instantiate a sound driver.
@@ -540,7 +540,7 @@ static int cs4270_probe(struct snd_soc_component *component) 


/**

 * cs4270_remove - ASoC remove function

 * @pdev: platform device

 * @component: ASoC component

 *

 * This function is the counterpart to cs4270_probe().

 */

sound/soc/codecs/cs42l42.c

+3 −6
Original line number Diff line number Diff line
@@ -1658,8 +1658,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
	ret = of_property_read_u32(np, "cirrus,btn-det-init-dbnce", &val);



	if (!ret) {

		if ((val >= CS42L42_BTN_DET_INIT_DBNCE_MIN) &&

			(val <= CS42L42_BTN_DET_INIT_DBNCE_MAX))

		if (val <= CS42L42_BTN_DET_INIT_DBNCE_MAX)

			cs42l42->btn_det_init_dbnce = val;

		else {

			dev_err(&i2c_client->dev,
@@ -1676,8 +1675,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
	ret = of_property_read_u32(np, "cirrus,btn-det-event-dbnce", &val);



	if (!ret) {

		if ((val >= CS42L42_BTN_DET_EVENT_DBNCE_MIN) &&

			(val <= CS42L42_BTN_DET_EVENT_DBNCE_MAX))

		if (val <= CS42L42_BTN_DET_EVENT_DBNCE_MAX)

			cs42l42->btn_det_event_dbnce = val;

		else {

			dev_err(&i2c_client->dev,
@@ -1695,8 +1693,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 


	if (!ret) {

		for (i = 0; i < CS42L42_NUM_BIASES; i++) {

			if ((thresholds[i] >= CS42L42_HS_DET_LEVEL_MIN) &&

				(thresholds[i] <= CS42L42_HS_DET_LEVEL_MAX))

			if (thresholds[i] <= CS42L42_HS_DET_LEVEL_MAX)

				cs42l42->bias_thresholds[i] = thresholds[i];

			else {

				dev_err(&i2c_client->dev,

sound/soc/codecs/wm8960.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static const int bclk_divs[] = { 
 *	triplet, we relax the bclk such that bclk is chosen as the

 *	closest available frequency greater than expected bclk.

 *

 * @wm8960_priv: wm8960 codec private data

 * @wm8960: codec private data

 * @mclk: MCLK used to derive sysclk

 * @sysclk_idx: sysclk_divs index for found sysclk

 * @dac_idx: dac_divs index for found lrclk

sound/soc/codecs/wm8994.c

+4 −0
Original line number Diff line number Diff line
@@ -3877,6 +3877,10 @@ static void wm1811_jackdet_bootstrap(struct work_struct *work) 
 *

 * @component:   WM8958 component

 * @jack:    jack to report detection events on

 * @det_cb: detection callback

 * @det_cb_data: data for detection callback

 * @id_cb: mic id callback

 * @id_cb_data: data for mic id callback

 *

 * Enable microphone detection functionality for the WM8958.  By

 * default simple detection which supports the detection of up to 6

sound/soc/codecs/wm8996.c

+3 −0
Original line number Diff line number Diff line
@@ -2224,6 +2224,9 @@ static void wm8996_free_gpio(struct wm8996_priv *wm8996) 


/**

 * wm8996_detect - Enable default WM8996 jack detection

 * @component: ASoC component

 * @jack: jack pointer

 * @polarity_cb: polarity callback

 *

 * The WM8996 has advanced accessory detection support for headsets.

 * This function provides a default implementation which integrates