ASoC: Name jack GPIOs based on jack not codec
PATCH 1/2 ASoC: Name jack GPIOs based on jack not codec
snd_soc_jack_gpio has a name field. Use that name when registering the IRQ, since this is far more informative than the codec driver name. This shows up in /proc/interrupts.
--- sound/soc/soc-jack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/soc-jack.c +1 -1
@@ -325,7 +325,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, gpio_handler,IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , - jack->codec->dev->driver->name, + gpios[i].name, &gpios[i]);if (ret) goto err;
Signature · 1 line
1.7.1
PATCH 2/2 ASoC: format_register_str: Don't clip register values
wordsize is used as the textual width of a register address.
regsize is used as the textual width of a register value.
The assignments to these values were swapped. In the case of WM8903, which has 8-bit register addresses and 16-bit register values, this caused the register values to be clipped to 2 digits instead of the full 4.
--- sound/soc/soc-core.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/soc-core.c +4 -4
@@ -92,8 +92,8 @@ static int min_bytes_needed(unsigned long val)static int format_register_str (struct snd_soc_codec *codec,unsigned int reg,char *buf,size_t len) { -int wordsize = codec->driver->reg_word_size *2 ; -int regsize =min_bytes_needed (codec->driver->reg_cache_size) *2 ; +int wordsize =min_bytes_needed (codec->driver->reg_cache_size) *2 ; +int regsize = codec->driver->reg_word_size *2 ;int ret;char tmpbuf[len +1 ];char regbuf[regsize +1 ];
@@ -132,8 +132,8 @@ static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf,size_t total =0 ;loff_t p =0 ; - wordsize = codec->driver->reg_word_size *2 ; - regsize =min_bytes_needed (codec->driver->reg_cache_size) *2 ; + wordsize =min_bytes_needed (codec->driver->reg_cache_size) *2 ; + regsize = codec->driver->reg_word_size *2 ; len = wordsize + regsize +2 +1 ;
Signature · 1 line
1.7.1
Mark Brown
AppliedQuoted 5 lines · Stephen Warren
snd_soc_jack_gpiohas a name field. Use that name when registering the IRQ, since this is far more informative than the codec driver name. This shows up in/proc/interrupts.Signed-off-by Stephen Warren <[email protected]>
Applied both, thanks.