mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-04 17:44:14 +08:00
Merge series "ASoC: codecs: remove cppcheck warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Lots of small fixes in various codec drivers that should have no functional impact. Pierre-Louis Bossart (23): ASoC: ab8500-codec: remove useless structure ASoC: ad1836: remove useless return ASoC: adau1977: remove useless return ASoC: cros_ec_codec: remove null pointer dereference warning ASoC: cx2070x: remove useless assignment ASoC: cx2070x: remove duplicate else branch ASoC: da7219-aad: remove useless initialization ASoC: hdac_hdmi: remove useless initializations ASoC: hdac_hdmi: align function arguments ASoC: hdmi-codec: remove useless initialization ASoC: hdmi-codec: remove unused spk_mask member ASoC: max98090: remove useless assignment ASoC: mt6358: remove useless initializations ASoC: mt6359: remove useless assignment ASoC: nau8825: remove useless assignment ASoC: pcm1681: remove useless assignment ASoC: sigmadsp: align function prototype ASoC: sti-sas: remove unused struct members ASoC: tas2562: remove useless assignment ASoC: tas2562: remove warning on return value ASoC: tas2770: remove useless initialization ASoC: tlv320dac33: clarify expression ASoC: tscs454: remove useless test on PLL disable sound/soc/codecs/ab8500-codec.c | 7 ------- sound/soc/codecs/ad1836.c | 2 -- sound/soc/codecs/adau1977.c | 2 -- sound/soc/codecs/cros_ec_codec.c | 2 +- sound/soc/codecs/cx2072x.c | 11 ++++------- sound/soc/codecs/da7219-aad.c | 2 +- sound/soc/codecs/hdac_hdmi.c | 14 +++++++------- sound/soc/codecs/hdac_hdmi.h | 2 +- sound/soc/codecs/hdmi-codec.c | 3 +-- sound/soc/codecs/max98090.c | 2 +- sound/soc/codecs/mt6358.c | 4 ++-- sound/soc/codecs/mt6359.c | 4 ++-- sound/soc/codecs/nau8825.c | 2 +- sound/soc/codecs/pcm1681.c | 2 +- sound/soc/codecs/sigmadsp.h | 2 +- sound/soc/codecs/sti-sas.c | 3 --- sound/soc/codecs/tas2562.c | 3 +-- sound/soc/codecs/tas2770.c | 2 +- sound/soc/codecs/tlv320dac33.c | 2 +- sound/soc/codecs/tscs454.c | 7 ++++++- 20 files changed, 32 insertions(+), 46 deletions(-) -- 2.25.1
This commit is contained in:
Mark Brown
commit
bb9faeccbd
@ -113,13 +113,6 @@ enum amic_idx {
|
||||
AMIC_IDX_2
|
||||
};
|
||||
|
||||
struct ab8500_codec_drvdata_dbg {
|
||||
struct regulator *vaud;
|
||||
struct regulator *vamic1;
|
||||
struct regulator *vamic2;
|
||||
struct regulator *vdmic;
|
||||
};
|
||||
|
||||
/* Private data for AB8500 device-driver */
|
||||
struct ab8500_codec_drvdata {
|
||||
struct regmap *regmap;
|
||||
|
||||
@ -305,8 +305,6 @@ static int ad1836_probe(struct snd_soc_component *component)
|
||||
return ret;
|
||||
|
||||
ret = snd_soc_dapm_add_routes(dapm, ad183x_adc_routes, num_adcs);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -236,8 +236,6 @@ static int adau1977_reset(struct adau1977 *adau1977)
|
||||
ret = regmap_write(adau1977->regmap, ADAU1977_REG_POWER,
|
||||
ADAU1977_POWER_RESET);
|
||||
regcache_cache_bypass(adau1977->regmap, false);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -94,7 +94,7 @@ static int send_ec_host_command(struct cros_ec_device *ec_dev, uint32_t cmd,
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
if (insize)
|
||||
if (in && insize)
|
||||
memcpy(in, msg->data, insize);
|
||||
|
||||
ret = 0;
|
||||
|
||||
@ -827,9 +827,6 @@ static int cx2072x_config_i2spcm(struct cx2072x_priv *cx2072x)
|
||||
}
|
||||
regdbt2.r.i2s_bclk_invert = is_bclk_inv;
|
||||
|
||||
reg1.r.rx_data_one_line = 1;
|
||||
reg1.r.tx_data_one_line = 1;
|
||||
|
||||
/* Configures the BCLK output */
|
||||
bclk_rate = cx2072x->sample_rate * frame_len;
|
||||
reg5.r.i2s_pcm_clk_div_chan_en = 0;
|
||||
@ -1433,11 +1430,11 @@ static int cx2072x_jack_status_check(void *data)
|
||||
state |= SND_JACK_HEADSET;
|
||||
if (type & 0x2)
|
||||
state |= SND_JACK_BTN_0;
|
||||
} else if (type & 0x4) {
|
||||
/* Nokia headset */
|
||||
state |= SND_JACK_HEADPHONE;
|
||||
} else {
|
||||
/* Headphone */
|
||||
/*
|
||||
* Nokia headset (type & 0x4) and
|
||||
* regular Headphone
|
||||
*/
|
||||
state |= SND_JACK_HEADPHONE;
|
||||
}
|
||||
}
|
||||
|
||||
@ -115,7 +115,7 @@ static void da7219_aad_hptest_work(struct work_struct *work)
|
||||
|
||||
__le16 tonegen_freq_hptest;
|
||||
u8 pll_srm_sts, pll_ctrl, gain_ramp_ctrl, accdet_cfg8;
|
||||
int report = 0, ret = 0;
|
||||
int report = 0, ret;
|
||||
|
||||
/* Lock DAPM, Kcontrols affected by this test and the PLL */
|
||||
snd_soc_dapm_mutex_lock(dapm);
|
||||
|
||||
@ -523,7 +523,7 @@ static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt(
|
||||
struct hdac_hdmi_cvt *cvt)
|
||||
{
|
||||
struct hdac_hdmi_pcm *pcm;
|
||||
struct hdac_hdmi_port *port = NULL;
|
||||
struct hdac_hdmi_port *port;
|
||||
int ret, i;
|
||||
|
||||
list_for_each_entry(pcm, &hdmi->pcm_list, head) {
|
||||
@ -713,7 +713,7 @@ static struct hdac_hdmi_pcm *hdac_hdmi_get_pcm(struct hdac_device *hdev,
|
||||
struct hdac_hdmi_port *port)
|
||||
{
|
||||
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
|
||||
struct hdac_hdmi_pcm *pcm = NULL;
|
||||
struct hdac_hdmi_pcm *pcm;
|
||||
struct hdac_hdmi_port *p;
|
||||
|
||||
list_for_each_entry(pcm, &hdmi->pcm_list, head) {
|
||||
@ -900,7 +900,7 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol,
|
||||
struct hdac_hdmi_port *port = w->priv;
|
||||
struct hdac_device *hdev = dev_to_hdac_dev(dapm->dev);
|
||||
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
|
||||
struct hdac_hdmi_pcm *pcm = NULL;
|
||||
struct hdac_hdmi_pcm *pcm;
|
||||
const char *cvt_name = e->texts[ucontrol->value.enumerated.item[0]];
|
||||
|
||||
ret = snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
|
||||
@ -1693,7 +1693,7 @@ static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe)
|
||||
{
|
||||
struct hdac_device *hdev = aptr;
|
||||
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
|
||||
struct hdac_hdmi_pin *pin = NULL;
|
||||
struct hdac_hdmi_pin *pin;
|
||||
struct hdac_hdmi_port *hport = NULL;
|
||||
struct snd_soc_component *component = hdmi->component;
|
||||
int i;
|
||||
@ -1958,7 +1958,7 @@ static int hdmi_codec_probe(struct snd_soc_component *component)
|
||||
struct hdac_device *hdev = hdmi->hdev;
|
||||
struct snd_soc_dapm_context *dapm =
|
||||
snd_soc_component_get_dapm(component);
|
||||
struct hdac_ext_link *hlink = NULL;
|
||||
struct hdac_ext_link *hlink;
|
||||
int ret;
|
||||
|
||||
hdmi->component = component;
|
||||
@ -2227,7 +2227,7 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct hdac_device *hdev = dev_to_hdac_dev(dev);
|
||||
struct hdac_bus *bus = hdev->bus;
|
||||
struct hdac_ext_link *hlink = NULL;
|
||||
struct hdac_ext_link *hlink;
|
||||
|
||||
dev_dbg(dev, "Enter: %s\n", __func__);
|
||||
|
||||
@ -2263,7 +2263,7 @@ static int hdac_hdmi_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct hdac_device *hdev = dev_to_hdac_dev(dev);
|
||||
struct hdac_bus *bus = hdev->bus;
|
||||
struct hdac_ext_link *hlink = NULL;
|
||||
struct hdac_ext_link *hlink;
|
||||
|
||||
dev_dbg(dev, "Enter: %s\n", __func__);
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#ifndef __HDAC_HDMI_H__
|
||||
#define __HDAC_HDMI_H__
|
||||
|
||||
int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int pcm,
|
||||
int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device,
|
||||
struct snd_soc_jack *jack);
|
||||
|
||||
int hdac_hdmi_jack_port_init(struct snd_soc_component *component,
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
|
||||
struct hdmi_codec_channel_map_table {
|
||||
unsigned char map; /* ALSA API channel map position */
|
||||
unsigned long spk_mask; /* speaker position bit mask */
|
||||
};
|
||||
|
||||
/*
|
||||
@ -735,7 +734,7 @@ static int hdmi_codec_set_jack(struct snd_soc_component *component,
|
||||
|
||||
static int hdmi_dai_spdif_probe(struct snd_soc_dai *dai)
|
||||
{
|
||||
struct hdmi_codec_daifmt *cf = dai->playback_dma_data;
|
||||
struct hdmi_codec_daifmt *cf;
|
||||
int ret;
|
||||
|
||||
ret = hdmi_dai_probe(dai);
|
||||
|
||||
@ -1832,7 +1832,7 @@ static const struct dmic_table dmic_table[] = { /* One for each pclk freq. */
|
||||
static int max98090_find_divisor(int target_freq, int pclk)
|
||||
{
|
||||
int current_diff = INT_MAX;
|
||||
int test_diff = INT_MAX;
|
||||
int test_diff;
|
||||
int divisor_index = 0;
|
||||
int i;
|
||||
|
||||
|
||||
@ -331,7 +331,7 @@ static void hp_zcd_disable(struct mt6358_priv *priv)
|
||||
|
||||
static void hp_main_output_ramp(struct mt6358_priv *priv, bool up)
|
||||
{
|
||||
int i = 0, stage = 0;
|
||||
int i, stage;
|
||||
int target = 7;
|
||||
|
||||
/* Enable/Reduce HPL/R main output stage step by step */
|
||||
@ -347,7 +347,7 @@ static void hp_main_output_ramp(struct mt6358_priv *priv, bool up)
|
||||
|
||||
static void hp_aux_feedback_loop_gain_ramp(struct mt6358_priv *priv, bool up)
|
||||
{
|
||||
int i = 0, stage = 0;
|
||||
int i, stage;
|
||||
|
||||
/* Reduce HP aux feedback loop gain step by step */
|
||||
for (i = 0; i <= 0xf; i++) {
|
||||
|
||||
@ -239,7 +239,7 @@ static void zcd_disable(struct mt6359_priv *priv)
|
||||
|
||||
static void hp_main_output_ramp(struct mt6359_priv *priv, bool up)
|
||||
{
|
||||
int i = 0, stage = 0;
|
||||
int i, stage;
|
||||
int target = 7;
|
||||
|
||||
/* Enable/Reduce HPL/R main output stage step by step */
|
||||
@ -257,7 +257,7 @@ static void hp_main_output_ramp(struct mt6359_priv *priv, bool up)
|
||||
|
||||
static void hp_aux_feedback_loop_gain_ramp(struct mt6359_priv *priv, bool up)
|
||||
{
|
||||
int i = 0, stage = 0;
|
||||
int i, stage;
|
||||
int target = 0xf;
|
||||
|
||||
/* Enable/Reduce HP aux feedback loop gain step by step */
|
||||
|
||||
@ -2111,7 +2111,7 @@ static int nau8825_set_pll(struct snd_soc_component *component, int pll_id, int
|
||||
|
||||
static int nau8825_mclk_prepare(struct nau8825 *nau8825, unsigned int freq)
|
||||
{
|
||||
int ret = 0;
|
||||
int ret;
|
||||
|
||||
nau8825->mclk = devm_clk_get(nau8825->dev, "mclk");
|
||||
if (IS_ERR(nau8825->mclk)) {
|
||||
|
||||
@ -84,7 +84,7 @@ static const int pcm1681_deemph[] = { 44100, 48000, 32000 };
|
||||
static int pcm1681_set_deemph(struct snd_soc_component *component)
|
||||
{
|
||||
struct pcm1681_private *priv = snd_soc_component_get_drvdata(component);
|
||||
int i = 0, val = -1, enable = 0;
|
||||
int i, val = -1, enable = 0;
|
||||
|
||||
if (priv->deemph) {
|
||||
for (i = 0; i < ARRAY_SIZE(pcm1681_deemph); i++) {
|
||||
|
||||
@ -59,7 +59,7 @@ struct sigmadsp *devm_sigmadsp_init_i2c(struct i2c_client *client,
|
||||
|
||||
int sigmadsp_attach(struct sigmadsp *sigmadsp,
|
||||
struct snd_soc_component *component);
|
||||
int sigmadsp_setup(struct sigmadsp *sigmadsp, unsigned int rate);
|
||||
int sigmadsp_setup(struct sigmadsp *sigmadsp, unsigned int samplerate);
|
||||
void sigmadsp_reset(struct sigmadsp *sigmadsp);
|
||||
|
||||
#endif
|
||||
|
||||
@ -51,14 +51,11 @@ static const struct reg_default stih407_sas_reg_defaults[] = {
|
||||
struct sti_dac_audio {
|
||||
struct regmap *regmap;
|
||||
struct regmap *virt_regmap;
|
||||
struct regmap_field **field;
|
||||
struct reset_control *rst;
|
||||
int mclk;
|
||||
};
|
||||
|
||||
struct sti_spdif_audio {
|
||||
struct regmap *regmap;
|
||||
struct regmap_field **field;
|
||||
int mclk;
|
||||
};
|
||||
|
||||
|
||||
@ -200,7 +200,6 @@ static int tas2562_set_dai_tdm_slot(struct snd_soc_dai *dai,
|
||||
right_slot = left_slot;
|
||||
} else {
|
||||
right_slot = __ffs(tx_mask);
|
||||
tx_mask &= ~(1 << right_slot);
|
||||
}
|
||||
}
|
||||
|
||||
@ -527,7 +526,7 @@ static int tas2562_volume_control_put(struct snd_kcontrol *kcontrol,
|
||||
|
||||
tas2562->volume_lvl = ucontrol->value.integer.value[0];
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Digital Volume Control. From 0 dB to -110 dB in 1 dB steps */
|
||||
|
||||
@ -106,7 +106,7 @@ static int tas2770_codec_suspend(struct snd_soc_component *component)
|
||||
static int tas2770_codec_resume(struct snd_soc_component *component)
|
||||
{
|
||||
struct tas2770_priv *tas2770 = snd_soc_component_get_drvdata(component);
|
||||
int ret = 0;
|
||||
int ret;
|
||||
|
||||
if (tas2770->sdz_gpio) {
|
||||
gpiod_set_value_cansleep(tas2770->sdz_gpio, 1);
|
||||
|
||||
@ -1071,7 +1071,7 @@ static void dac33_calculate_times(struct snd_pcm_substream *substream,
|
||||
*/
|
||||
dac33->nsample = period_size *
|
||||
((dac33->alarm_threshold / period_size) +
|
||||
(dac33->alarm_threshold % period_size ?
|
||||
((dac33->alarm_threshold % period_size) ?
|
||||
1 : 0));
|
||||
else if (period_size > nsample_limit)
|
||||
dac33->nsample = nsample_limit;
|
||||
|
||||
@ -727,7 +727,12 @@ static int pll_power_event(struct snd_soc_dapm_widget *w,
|
||||
if (enable)
|
||||
val = pll1 ? FV_PLL1CLKEN_ENABLE : FV_PLL2CLKEN_ENABLE;
|
||||
else
|
||||
val = pll1 ? FV_PLL1CLKEN_DISABLE : FV_PLL2CLKEN_DISABLE;
|
||||
/*
|
||||
* FV_PLL1CLKEN_DISABLE and FV_PLL2CLKEN_DISABLE are
|
||||
* identical zero vzalues, there is no need to test
|
||||
* the PLL index
|
||||
*/
|
||||
val = FV_PLL1CLKEN_DISABLE;
|
||||
|
||||
ret = snd_soc_component_update_bits(component, R_PLLCTL, msk, val);
|
||||
if (ret < 0) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user