ASoC: rt5677: Few clean ups to the driver
Subsystems (3)
v2 cover ASoC: rt5677: Few clean ups to the driver
This series removes legacy and unused platform data along with fixing code which compiler complains about.
In v2:
- fix compilation error (kbuild bot)
- add couple more patches to fix the code according to compile complains
Andy Shevchenko (3):
ASoC: rt5677: Hide platform data in the module sources
ASoC: rt5677: Refactor code to avoid comparison unsigned >= 0
ASoC: rt5677: Remove never used variables
include/sound/rt5677.h | 45 -------------------------- sound/soc/codecs/rt5677.c | 81 ++++++++++++++++++++++------------------------- sound/soc/codecs/rt5677.h | 30 +++++++++++++++++- 3 files changed, 67 insertions(+), 89 deletions(-) delete mode 100644 include/sound/rt5677.h
Signature · 1 line
2.11.0
PATCH v2 1/3 ASoC: rt5677: Hide platform data in the module sources
There is no user of legacy platform data.
Remove separate header and hide its content inside module sources.
--- include/sound/rt5677.h | 45 --------------------------------------------- sound/soc/codecs/rt5677.c | 29 +++++++++++++++++------------ sound/soc/codecs/rt5677.h | 30 +++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 58 deletions(-) delete mode 100644 include/sound/rt5677.h
include/sound/rt5677.h deleted +0 -45
@@ -1,45 +0,0 @@ -/* -* linux/sound/rt5677.h -- Platform data for RT5677 -* -* Copyright 2013 Realtek Semiconductor Corp. -* Author: Oder Chiou <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __LINUX_SND_RT5677_H -#define __LINUX_SND_RT5677_H - -enum rt5677_dmic2_clk { -RT5677_DMIC_CLK1 =0 , -RT5677_DMIC_CLK2 =1 , -}; - - -struct rt5677_platform_data { -/* IN1/IN2/LOUT1/LOUT2/LOUT3 can optionally be differential */ -bool in1_diff; -bool in2_diff; -bool lout1_diff; -bool lout2_diff; -bool lout3_diff; -/* DMIC2 clock source selection */ -enum rt5677_dmic2_clk dmic2_clk_pin; - -/* configures GPIO, 0 - floating, 1 - pulldown, 2 - pullup */ -u8 gpio_config[6 ]; - -/* jd1 can select 0 ~ 3 as OFF, GPIO1, GPIO2 and GPIO3 respectively */ -unsigned int jd1_gpio; -/* jd2 and jd3 can select 0 ~ 3 as -OFF, GPIO4, GPIO5 and GPIO6 respectively */ -unsigned int jd2_gpio; -unsigned int jd3_gpio; - -/* Set MICBIAS1 VDD 1v8 or 3v3 */ -bool micbias1_vdd_3v3; -}; - -#endif
sound/soc/codecs/rt5677.c +17 -12
@@ -21,6 +21,7 @@#include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/firmware.h> +#include <linux/of_device.h> #include <linux/property.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -5019,25 +5020,21 @@ static const struct regmap_config rt5677_regmap = { };static const struct i2c_device_id rt5677_i2c_id[] = { - {"rt5677" ,RT5677 }, - {"rt5676" ,RT5676 }, { } };MODULE_DEVICE_TABLE (i2c, rt5677_i2c_id);static const struct of_device_id rt5677_of_match[] = { - { .compatible ="realtek,rt5677" , }, + { .compatible ="realtek,rt5677" ,RT5677 }, { } };MODULE_DEVICE_TABLE (of, rt5677_of_match); -#ifdef CONFIG_ACPI static const struct acpi_device_id rt5677_acpi_match[] = { {"RT5677CE" ,RT5677 }, { } };MODULE_DEVICE_TABLE (acpi, rt5677_acpi_match); -#endif static void rt5677_read_acpi_properties (struct rt5677_priv *rt5677,struct device *dev)
@@ -5147,7 +5144,6 @@ static void rt5677_free_irq(struct i2c_client *i2c)static int rt5677_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) { -struct rt5677_platform_data *pdata =dev_get_platdata (&i2c->dev);struct rt5677_priv *rt5677;int ret;unsigned int val;
@@ -5159,16 +5155,25 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, rt5677); - rt5677->type = id->driver_data; +if (i2c->dev.of_node) { +const struct of_device_id *match_id; + + match_id =of_match_device (rt5677_of_match, &i2c->dev); +if (match_id) + rt5677->type = (enum rt5677_type )match_id->data; -if (pdata) - rt5677->pdata = *pdata; -else if (i2c->dev.of_node)rt5677_read_device_properties (rt5677, &i2c->dev); -else if (ACPI_HANDLE (&i2c->dev)) + }else if (ACPI_HANDLE (&i2c->dev)) { +const struct acpi_device_id *acpi_id; + + acpi_id =acpi_match_device (rt5677_acpi_match, &i2c->dev); +if (acpi_id) + rt5677->type = (enum rt5677_type )acpi_id->driver_data; +rt5677_read_acpi_properties (rt5677, &i2c->dev); -else + }else {return -EINVAL ; + }/* pow-ldo2 and reset are optional. The codec pins may be statically * connected on the board without gpios. If the gpio device property
sound/soc/codecs/rt5677.h +29 -1
@@ -12,7 +12,6 @@#ifndef __RT5677_H__#define __RT5677_H__ -#include <sound/rt5677.h> #include <linux/gpio/driver.h> #include <linux/gpio/consumer.h>
@@ -1761,6 +1760,35 @@ enum { RT5677_I2S4_SOURCE = (0x1 << 18), }; +enum rt5677_dmic2_clk { +RT5677_DMIC_CLK1 =0 , +RT5677_DMIC_CLK2 =1 , +}; + +struct rt5677_platform_data { +/* IN1/IN2/LOUT1/LOUT2/LOUT3 can optionally be differential */ +bool in1_diff; +bool in2_diff; +bool lout1_diff; +bool lout2_diff; +bool lout3_diff; +/* DMIC2 clock source selection */ +enum rt5677_dmic2_clk dmic2_clk_pin; + +/* configures GPIO, 0 - floating, 1 - pulldown, 2 - pullup */ +u8 gpio_config[6 ]; + +/* jd1 can select 0 ~ 3 as OFF, GPIO1, GPIO2 and GPIO3 respectively */ +unsigned int jd1_gpio; +/* jd2 and jd3 can select 0 ~ 3 as +OFF, GPIO4, GPIO5 and GPIO6 respectively */ +unsigned int jd2_gpio; +unsigned int jd3_gpio; + +/* Set MICBIAS1 VDD 1v8 or 3v3 */ +bool micbias1_vdd_3v3; +}; +struct rt5677_priv {struct snd_soc_codec *codec;struct rt5677_platform_data pdata;
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: rt5677: Hide platform data in the module sources" to the asoc tree
The patch
ASoC: rt5677: Hide platform data in the module sources
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
ddc9e69b9dc23d4c0d8ed829575327746ea77a04Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Tue, 18 Jul 2017 20:34:17 +0300
Subject: [PATCH] ASoC: rt5677: Hide platform data in the module sources
There is no user of legacy platform data.
Remove separate header and hide its content inside module sources.
--- include/sound/rt5677.h | 45 --------------------------------------------- sound/soc/codecs/rt5677.c | 29 +++++++++++++++++------------ sound/soc/codecs/rt5677.h | 30 +++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 58 deletions(-) delete mode 100644 include/sound/rt5677.h
include/sound/rt5677.h deleted +0 -45
@@ -1,45 +0,0 @@ -/* -* linux/sound/rt5677.h -- Platform data for RT5677 -* -* Copyright 2013 Realtek Semiconductor Corp. -* Author: Oder Chiou <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __LINUX_SND_RT5677_H -#define __LINUX_SND_RT5677_H - -enum rt5677_dmic2_clk { -RT5677_DMIC_CLK1 =0 , -RT5677_DMIC_CLK2 =1 , -}; - - -struct rt5677_platform_data { -/* IN1/IN2/LOUT1/LOUT2/LOUT3 can optionally be differential */ -bool in1_diff; -bool in2_diff; -bool lout1_diff; -bool lout2_diff; -bool lout3_diff; -/* DMIC2 clock source selection */ -enum rt5677_dmic2_clk dmic2_clk_pin; - -/* configures GPIO, 0 - floating, 1 - pulldown, 2 - pullup */ -u8 gpio_config[6 ]; - -/* jd1 can select 0 ~ 3 as OFF, GPIO1, GPIO2 and GPIO3 respectively */ -unsigned int jd1_gpio; -/* jd2 and jd3 can select 0 ~ 3 as -OFF, GPIO4, GPIO5 and GPIO6 respectively */ -unsigned int jd2_gpio; -unsigned int jd3_gpio; - -/* Set MICBIAS1 VDD 1v8 or 3v3 */ -bool micbias1_vdd_3v3; -}; - -#endif
sound/soc/codecs/rt5677.c +17 -12
@@ -21,6 +21,7 @@#include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/firmware.h> +#include <linux/of_device.h> #include <linux/property.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -5019,25 +5020,21 @@ static const struct regmap_config rt5677_regmap = { };static const struct i2c_device_id rt5677_i2c_id[] = { - {"rt5677" ,RT5677 }, - {"rt5676" ,RT5676 }, { } };MODULE_DEVICE_TABLE (i2c, rt5677_i2c_id);static const struct of_device_id rt5677_of_match[] = { - { .compatible ="realtek,rt5677" , }, + { .compatible ="realtek,rt5677" ,RT5677 }, { } };MODULE_DEVICE_TABLE (of, rt5677_of_match); -#ifdef CONFIG_ACPI static const struct acpi_device_id rt5677_acpi_match[] = { {"RT5677CE" ,RT5677 }, { } };MODULE_DEVICE_TABLE (acpi, rt5677_acpi_match); -#endif static void rt5677_read_acpi_properties (struct rt5677_priv *rt5677,struct device *dev)
@@ -5147,7 +5144,6 @@ static void rt5677_free_irq(struct i2c_client *i2c)static int rt5677_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) { -struct rt5677_platform_data *pdata =dev_get_platdata (&i2c->dev);struct rt5677_priv *rt5677;int ret;unsigned int val;
@@ -5159,16 +5155,25 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, rt5677); - rt5677->type = id->driver_data; +if (i2c->dev.of_node) { +const struct of_device_id *match_id; + + match_id =of_match_device (rt5677_of_match, &i2c->dev); +if (match_id) + rt5677->type = (enum rt5677_type )match_id->data; -if (pdata) - rt5677->pdata = *pdata; -else if (i2c->dev.of_node)rt5677_read_device_properties (rt5677, &i2c->dev); -else if (ACPI_HANDLE (&i2c->dev)) + }else if (ACPI_HANDLE (&i2c->dev)) { +const struct acpi_device_id *acpi_id; + + acpi_id =acpi_match_device (rt5677_acpi_match, &i2c->dev); +if (acpi_id) + rt5677->type = (enum rt5677_type )acpi_id->driver_data; +rt5677_read_acpi_properties (rt5677, &i2c->dev); -else + }else {return -EINVAL ; + }/* pow-ldo2 and reset are optional. The codec pins may be statically * connected on the board without gpios. If the gpio device property
sound/soc/codecs/rt5677.h +29 -1
@@ -12,7 +12,6 @@#ifndef __RT5677_H__#define __RT5677_H__ -#include <sound/rt5677.h> #include <linux/gpio/driver.h> #include <linux/gpio/consumer.h>
@@ -1761,6 +1760,35 @@ enum { RT5677_I2S4_SOURCE = (0x1 << 18), }; +enum rt5677_dmic2_clk { +RT5677_DMIC_CLK1 =0 , +RT5677_DMIC_CLK2 =1 , +}; + +struct rt5677_platform_data { +/* IN1/IN2/LOUT1/LOUT2/LOUT3 can optionally be differential */ +bool in1_diff; +bool in2_diff; +bool lout1_diff; +bool lout2_diff; +bool lout3_diff; +/* DMIC2 clock source selection */ +enum rt5677_dmic2_clk dmic2_clk_pin; + +/* configures GPIO, 0 - floating, 1 - pulldown, 2 - pullup */ +u8 gpio_config[6 ]; + +/* jd1 can select 0 ~ 3 as OFF, GPIO1, GPIO2 and GPIO3 respectively */ +unsigned int jd1_gpio; +/* jd2 and jd3 can select 0 ~ 3 as +OFF, GPIO4, GPIO5 and GPIO6 respectively */ +unsigned int jd2_gpio; +unsigned int jd3_gpio; + +/* Set MICBIAS1 VDD 1v8 or 3v3 */ +bool micbias1_vdd_3v3; +}; +struct rt5677_priv {struct snd_soc_codec *codec;struct rt5677_platform_data pdata;
Signature · 1 line
2.13.2
PATCH v2 2/3 ASoC: rt5677: Refactor code to avoid comparison unsigned >= 0
In reply to Andy Shevchenkort5677_to_irq() has couple of redundant conditionals, one of which compares unsigned variable to be great than or equal to zero which is always true as compiler notices:
sound/soc/codecs/rt5677.c: In function ‘rt5677_to_irq’:sound/soc/codecs/rt5677.c:4626:13: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
Refactor the code by removing redundant conditionals.
--- sound/soc/codecs/rt5677.c | 50 ++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 29 deletions(-)
sound/soc/codecs/rt5677.c +21 -29
@@ -4625,35 +4625,27 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset)struct regmap_irq_chip_data *data = rt5677->irq_data;int irq; -if (offset >=RT5677_GPIO1 && offset <=RT5677_GPIO3 ) { -if ((rt5677->pdata.jd1_gpio ==1 && offset ==RT5677_GPIO1 ) || - (rt5677->pdata.jd1_gpio ==2 && - offset ==RT5677_GPIO2 ) || - (rt5677->pdata.jd1_gpio ==3 && - offset ==RT5677_GPIO3 )) { - irq =RT5677_IRQ_JD1 ; - }else { -return -ENXIO ; - } - } - -if (offset >=RT5677_GPIO4 && offset <=RT5677_GPIO6 ) { -if ((rt5677->pdata.jd2_gpio ==1 && offset ==RT5677_GPIO4 ) || - (rt5677->pdata.jd2_gpio ==2 && - offset ==RT5677_GPIO5 ) || - (rt5677->pdata.jd2_gpio ==3 && - offset ==RT5677_GPIO6 )) { - irq =RT5677_IRQ_JD2 ; - }else if ((rt5677->pdata.jd3_gpio ==1 && - offset ==RT5677_GPIO4 ) || - (rt5677->pdata.jd3_gpio ==2 && - offset ==RT5677_GPIO5 ) || - (rt5677->pdata.jd3_gpio ==3 && - offset ==RT5677_GPIO6 )) { - irq =RT5677_IRQ_JD3 ; - }else { -return -ENXIO ; - } +if ((rt5677->pdata.jd1_gpio ==1 && offset ==RT5677_GPIO1 ) || + (rt5677->pdata.jd1_gpio ==2 && + offset ==RT5677_GPIO2 ) || + (rt5677->pdata.jd1_gpio ==3 && + offset ==RT5677_GPIO3 )) { + irq =RT5677_IRQ_JD1 ; + }else if ((rt5677->pdata.jd2_gpio ==1 && offset ==RT5677_GPIO4 ) || + (rt5677->pdata.jd2_gpio ==2 && + offset ==RT5677_GPIO5 ) || + (rt5677->pdata.jd2_gpio ==3 && + offset ==RT5677_GPIO6 )) { + irq =RT5677_IRQ_JD2 ; + }else if ((rt5677->pdata.jd3_gpio ==1 && + offset ==RT5677_GPIO4 ) || + (rt5677->pdata.jd3_gpio ==2 && + offset ==RT5677_GPIO5 ) || + (rt5677->pdata.jd3_gpio ==3 && + offset ==RT5677_GPIO6 )) { + irq =RT5677_IRQ_JD3 ; + }else { +return -ENXIO ; }return regmap_irq_get_virq (data, irq);
Signature · 6 lines
2.11.0 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerApplied "ASoC: rt5677: Refactor code to avoid comparison unsigned >= 0" to the asoc tree
The patch
ASoC: rt5677: Refactor code to avoid comparison unsigned >= 0
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
d4e753d3aa2c278cb1f7b4a61987c4037316e0fdMon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Tue, 18 Jul 2017 20:34:18 +0300
Subject: [PATCH] ASoC: rt5677: Refactor code to avoid comparison unsigned >= 0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
rt5677_to_irq() has couple of redundant conditionals, one of which compares unsigned variable to be great than or equal to zero which is always true as compiler notices:
sound/soc/codecs/rt5677.c: In function ‘rt5677_to_irq’:sound/soc/codecs/rt5677.c:4626:13: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
Refactor the code by removing redundant conditionals.
--- sound/soc/codecs/rt5677.c | 50 ++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 29 deletions(-)
sound/soc/codecs/rt5677.c +21 -29
@@ -4625,35 +4625,27 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset)struct regmap_irq_chip_data *data = rt5677->irq_data;int irq; -if (offset >=RT5677_GPIO1 && offset <=RT5677_GPIO3 ) { -if ((rt5677->pdata.jd1_gpio ==1 && offset ==RT5677_GPIO1 ) || - (rt5677->pdata.jd1_gpio ==2 && - offset ==RT5677_GPIO2 ) || - (rt5677->pdata.jd1_gpio ==3 && - offset ==RT5677_GPIO3 )) { - irq =RT5677_IRQ_JD1 ; - }else { -return -ENXIO ; - } - } - -if (offset >=RT5677_GPIO4 && offset <=RT5677_GPIO6 ) { -if ((rt5677->pdata.jd2_gpio ==1 && offset ==RT5677_GPIO4 ) || - (rt5677->pdata.jd2_gpio ==2 && - offset ==RT5677_GPIO5 ) || - (rt5677->pdata.jd2_gpio ==3 && - offset ==RT5677_GPIO6 )) { - irq =RT5677_IRQ_JD2 ; - }else if ((rt5677->pdata.jd3_gpio ==1 && - offset ==RT5677_GPIO4 ) || - (rt5677->pdata.jd3_gpio ==2 && - offset ==RT5677_GPIO5 ) || - (rt5677->pdata.jd3_gpio ==3 && - offset ==RT5677_GPIO6 )) { - irq =RT5677_IRQ_JD3 ; - }else { -return -ENXIO ; - } +if ((rt5677->pdata.jd1_gpio ==1 && offset ==RT5677_GPIO1 ) || + (rt5677->pdata.jd1_gpio ==2 && + offset ==RT5677_GPIO2 ) || + (rt5677->pdata.jd1_gpio ==3 && + offset ==RT5677_GPIO3 )) { + irq =RT5677_IRQ_JD1 ; + }else if ((rt5677->pdata.jd2_gpio ==1 && offset ==RT5677_GPIO4 ) || + (rt5677->pdata.jd2_gpio ==2 && + offset ==RT5677_GPIO5 ) || + (rt5677->pdata.jd2_gpio ==3 && + offset ==RT5677_GPIO6 )) { + irq =RT5677_IRQ_JD2 ; + }else if ((rt5677->pdata.jd3_gpio ==1 && + offset ==RT5677_GPIO4 ) || + (rt5677->pdata.jd3_gpio ==2 && + offset ==RT5677_GPIO5 ) || + (rt5677->pdata.jd3_gpio ==3 && + offset ==RT5677_GPIO6 )) { + irq =RT5677_IRQ_JD3 ; + }else { +return -ENXIO ; }return regmap_irq_get_virq (data, irq);
Signature · 1 line
2.13.2
PATCH v2 3/3 ASoC: rt5677: Remove never used variables
In reply to Andy ShevchenkoThere are two variables that have never been used.
sound/soc/codecs/rt5677.c:785:35: warning: ‘in_vol_tlv’ defined but not used [-Wunused-const-variable=] static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
sound/soc/codecs/rt5677.c:783:35: warning: ‘out_vol_tlv’ defined but not used [-Wunused-const-variable=] static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);
Simple remove them.
--- sound/soc/codecs/rt5677.c | 2 -- 1 file changed, 2 deletions(-)
sound/soc/codecs/rt5677.c +0 -2
@@ -780,9 +780,7 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)return 0 ; } -static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0); static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0); -static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0); static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); static const DECLARE_TLV_DB_SCALE(st_vol_tlv, -4650, 150, 0);
Signature · 6 lines
2.11.0 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerRe: [PATCH v2 3/3] ASoC: rt5677: Remove never used variables
Quoted 9 lines · Andy Shevchenko
There are two variables that have never been used.
sound/soc/codecs/rt5677.c:785:35: warning: ‘in_vol_tlv’ defined but not used [-Wunused-const-variable=] static constDECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
sound/soc/codecs/rt5677.c:783:35: warning: ‘out_vol_tlv’ defined but not used [-Wunused-const-variable=] static constDECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);Simple remove them.
Are we sure this doesn't mean something has the wrong TLV or a missing TLV?
Re: [PATCH v2 3/3] ASoC: rt5677: Remove never used variables
Quoted 7 lines · Mark Brown
Quoted 6 lines · Andy Shevchenko
There are two variables that have never been used.
sound/soc/codecs/rt5677.c:785:35: warning: ‘in_vol_tlv’ defined but not used [-Wunused-const-variable=]
static constDECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
Quoted 8 lines
Quoted 5 lines
sound/soc/codecs/rt5677.c:783:35: warning: ‘out_vol_tlv’ defined but not used [-Wunused-const-variable=]
static constDECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);Simple remove them.
Are we sure this doesn't mean something has the wrong TLV or a missing TLV?
Good question.
If it so, it should not have been working (properly) at the beginning.
Guys from Realtek, can you comment on this?
Signature · 6 lines
Andy Shevchenko <[email protected]> Intel Finland Oy _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Oder Chiou
maintainerRe: [PATCH v2 3/3] ASoC: rt5677: Remove never used variables
Quoted 14 lines · Mark Brown
Quoted 13 lines · Andy Shevchenko
Quoted 11 lines
There are two variables that have never been used.
sound/soc/codecs/rt5677.c:785:35: warning: ‘in_vol_tlv’ defined but not used [-Wunused-const-variable=] static constDECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
sound/soc/codecs/rt5677.c:783:35: warning: ‘out_vol_tlv’ defined but not used [-Wunused-const-variable=] static constDECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);Simple remove them.
Quoted 9 lines
Quoted 2 lines
Are we sure this doesn't mean something has the wrong TLV or a missing TLV?
Good question.
If it so, it should not have been working (properly) at the beginning.
Guys from Realtek, can you comment on this?
They are seemed redundant definitions, thanks.
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerApplied "ASoC: rt5677: Remove never used variables" to the asoc tree
In reply to Andy ShevchenkoThe patch
ASoC: rt5677: Remove never used variables
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
c0d1cb8366bab9963822c27b0d40cb8b32928cdcMon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Tue, 18 Jul 2017 20:34:19 +0300
Subject: [PATCH] ASoC: rt5677: Remove never used variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There are two variables that have never been used.
sound/soc/codecs/rt5677.c:785:35: warning: ‘in_vol_tlv’ defined but not used [-Wunused-const-variable=] static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
sound/soc/codecs/rt5677.c:783:35: warning: ‘out_vol_tlv’ defined but not used [-Wunused-const-variable=] static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);
Simple remove them.
--- sound/soc/codecs/rt5677.c | 2 -- 1 file changed, 2 deletions(-)
sound/soc/codecs/rt5677.c +0 -2
@@ -780,9 +780,7 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)return 0 ; } -static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0); static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0); -static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0); static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); static const DECLARE_TLV_DB_SCALE(st_vol_tlv, -4650, 150, 0);
Signature · 1 line
2.13.2