[alsa-devel] [PATCH 0/2] sound: soc: trivial stuff for tlv320aic3x
Not important, but nice to have :)
Felipe Contreras (2): sound: soc: add alias for tlv320aic3x sound: soc: tlv320aic3x: remove unused code
sound/soc/codecs/tlv320aic3x.c | 37 +------------------------------------ sound/soc/codecs/tlv320aic3x.h | 9 --------- 2 files changed, 1 insertions(+), 45 deletions(-)
According to the documentation, should help hotplugging.
Signed-off-by: Felipe Contreras felipe.contreras@gmail.com --- sound/soc/codecs/tlv320aic3x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 492f22f..00eb29d 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1565,3 +1565,4 @@ module_exit(aic3x_exit); MODULE_DESCRIPTION("ASoC TLV320AIC3X codec driver"); MODULE_AUTHOR("Vladimir Barinov"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("i2c:tlv320aic3x");
2012/2/1 Felipe Contreras felipe.contreras@gmail.com:
According to the documentation, should help hotplugging.
Signed-off-by: Felipe Contreras felipe.contreras@gmail.com
sound/soc/codecs/tlv320aic3x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 492f22f..00eb29d 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1565,3 +1565,4 @@ module_exit(aic3x_exit); MODULE_DESCRIPTION("ASoC TLV320AIC3X codec driver"); MODULE_AUTHOR("Vladimir Barinov"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("i2c:tlv320aic3x");
This is not required because "tlv320aic3x" is already in the aic3x_i2c_id table. MODULE_DEVICE_TABLE will automatically setup this modalias.
-- 1.7.9
On Wed, Feb 1, 2012 at 3:56 AM, Axel Lin axel.lin@gmail.com wrote:
2012/2/1 Felipe Contreras felipe.contreras@gmail.com:
According to the documentation, should help hotplugging.
Signed-off-by: Felipe Contreras felipe.contreras@gmail.com
sound/soc/codecs/tlv320aic3x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 492f22f..00eb29d 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1565,3 +1565,4 @@ module_exit(aic3x_exit); MODULE_DESCRIPTION("ASoC TLV320AIC3X codec driver"); MODULE_AUTHOR("Vladimir Barinov"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("i2c:tlv320aic3x");
This is not required because "tlv320aic3x" is already in the aic3x_i2c_id table. MODULE_DEVICE_TABLE will automatically setup this modalias.
Since when? Last time I checked that was not the case. I will try again with v3.2 final, but I think on some of the rc's the alias wasn't there.
On Wed, Feb 01, 2012 at 01:57:56PM +0200, Felipe Contreras wrote:
On Wed, Feb 1, 2012 at 3:56 AM, Axel Lin axel.lin@gmail.com wrote:
+MODULE_ALIAS("i2c:tlv320aic3x");
This is not required because "tlv320aic3x" is already in the aic3x_i2c_id table. MODULE_DEVICE_TABLE will automatically setup this modalias.
Since when? Last time I checked that was not the case. I will try again with v3.2 final, but I think on some of the rc's the alias wasn't there.
Since it was introduced, this is really nothing new (which is why you'll not find I2C drivers with MODULE_ALIAS). This is the whole point of having MODULE_DEVICE_TABLE.
Looks like nobody is or will be using this code.
Signed-off-by: Felipe Contreras felipe.contreras@gmail.com --- sound/soc/codecs/tlv320aic3x.c | 36 ------------------------------------ sound/soc/codecs/tlv320aic3x.h | 9 --------- 2 files changed, 0 insertions(+), 45 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 00eb29d..4dd10e2 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1185,25 +1185,6 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, return 0; }
-void aic3x_set_gpio(struct snd_soc_codec *codec, int gpio, int state) -{ - u8 reg = gpio ? AIC3X_GPIO2_REG : AIC3X_GPIO1_REG; - u8 bit = gpio ? 3: 0; - u8 val = snd_soc_read(codec, reg) & ~(1 << bit); - snd_soc_write(codec, reg, val | (!!state << bit)); -} -EXPORT_SYMBOL_GPL(aic3x_set_gpio); - -int aic3x_get_gpio(struct snd_soc_codec *codec, int gpio) -{ - u8 reg = gpio ? AIC3X_GPIO2_REG : AIC3X_GPIO1_REG; - u8 val = 0, bit = gpio ? 2 : 1; - - aic3x_read(codec, reg, &val); - return (val >> bit) & 1; -} -EXPORT_SYMBOL_GPL(aic3x_get_gpio); - void aic3x_set_headset_detection(struct snd_soc_codec *codec, int detect, int headset_debounce, int button_debounce) { @@ -1221,23 +1202,6 @@ void aic3x_set_headset_detection(struct snd_soc_codec *codec, int detect,
snd_soc_write(codec, AIC3X_HEADSET_DETECT_CTRL_A, val); } -EXPORT_SYMBOL_GPL(aic3x_set_headset_detection); - -int aic3x_headset_detected(struct snd_soc_codec *codec) -{ - u8 val = 0; - aic3x_read(codec, AIC3X_HEADSET_DETECT_CTRL_B, &val); - return (val >> 4) & 1; -} -EXPORT_SYMBOL_GPL(aic3x_headset_detected); - -int aic3x_button_pressed(struct snd_soc_codec *codec) -{ - u8 val = 0; - aic3x_read(codec, AIC3X_HEADSET_DETECT_CTRL_B, &val); - return (val >> 5) & 1; -} -EXPORT_SYMBOL_GPL(aic3x_button_pressed);
#define AIC3X_RATES SNDRV_PCM_RATE_8000_96000 #define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ diff --git a/sound/soc/codecs/tlv320aic3x.h b/sound/soc/codecs/tlv320aic3x.h index 06a1978..6f097fb 100644 --- a/sound/soc/codecs/tlv320aic3x.h +++ b/sound/soc/codecs/tlv320aic3x.h @@ -212,9 +212,6 @@ /* Default input volume */ #define DEFAULT_GAIN 0x20
-void aic3x_set_gpio(struct snd_soc_codec *codec, int gpio, int state); -int aic3x_get_gpio(struct snd_soc_codec *codec, int gpio); - /* headset detection / button API */
/* The AIC3x supports detection of stereo headsets (GND + left + right signal) @@ -252,10 +249,4 @@ enum { #define AIC3X_BUTTON_DEBOUNCE_SHIFT 0 #define AIC3X_BUTTON_DEBOUNCE_MASK 3
-/* see the enums above for valid parameters to this function */ -void aic3x_set_headset_detection(struct snd_soc_codec *codec, int detect, - int headset_debounce, int button_debounce); -int aic3x_headset_detected(struct snd_soc_codec *codec); -int aic3x_button_pressed(struct snd_soc_codec *codec); - #endif /* _AIC3X_H */
On Wed, Feb 01, 2012 at 03:06:20AM +0200, Felipe Contreras wrote:
Looks like nobody is or will be using this code.
Applied but please make some effort to use subject lines appropriate for the subsystem.
participants (3)
-
Axel Lin -
Felipe Contreras -
Mark Brown