mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ALSA: ice1712: wm8766: Remove some unused functions
@ 2015-01-11 15:31 Rickard Strandqvist
  2015-01-11 16:04 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Rickard Strandqvist @ 2015-01-11 15:31 UTC (permalink / raw)
  To: Jaroslav Kysela, Takashi Iwai
  Cc: Rickard Strandqvist, alsa-devel, linux-kernel

Removes some functions that are not used anywhere:
snd_wm8766_set_power() snd_wm8766_set_master_mode()

This was partially found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 sound/pci/ice1712/wm8766.c |   16 ----------------
 sound/pci/ice1712/wm8766.h |    2 --
 2 files changed, 18 deletions(-)

diff --git a/sound/pci/ice1712/wm8766.c b/sound/pci/ice1712/wm8766.c
index 21b373b..f7ac8d5 100644
--- a/sound/pci/ice1712/wm8766.c
+++ b/sound/pci/ice1712/wm8766.c
@@ -183,22 +183,6 @@ void snd_wm8766_set_if(struct snd_wm8766 *wm, u16 dac)
 	snd_wm8766_write(wm, WM8766_REG_IFCTRL, val | dac);
 }
 
-void snd_wm8766_set_master_mode(struct snd_wm8766 *wm, u16 mode)
-{
-	u16 val = wm->regs[WM8766_REG_DACCTRL3] & ~WM8766_DAC3_MSTR_MASK;
-
-	mode &= WM8766_DAC3_MSTR_MASK;
-	snd_wm8766_write(wm, WM8766_REG_DACCTRL3, val | mode);
-}
-
-void snd_wm8766_set_power(struct snd_wm8766 *wm, u16 power)
-{
-	u16 val = wm->regs[WM8766_REG_DACCTRL3] & ~WM8766_DAC3_POWER_MASK;
-
-	power &= WM8766_DAC3_POWER_MASK;
-	snd_wm8766_write(wm, WM8766_REG_DACCTRL3, val | power);
-}
-
 void snd_wm8766_volume_restore(struct snd_wm8766 *wm)
 {
 	u16 val = wm->regs[WM8766_REG_DACR1];
diff --git a/sound/pci/ice1712/wm8766.h b/sound/pci/ice1712/wm8766.h
index c119f84..18c8d9d 100644
--- a/sound/pci/ice1712/wm8766.h
+++ b/sound/pci/ice1712/wm8766.h
@@ -155,8 +155,6 @@ struct snd_wm8766 {
 void snd_wm8766_init(struct snd_wm8766 *wm);
 void snd_wm8766_resume(struct snd_wm8766 *wm);
 void snd_wm8766_set_if(struct snd_wm8766 *wm, u16 dac);
-void snd_wm8766_set_master_mode(struct snd_wm8766 *wm, u16 mode);
-void snd_wm8766_set_power(struct snd_wm8766 *wm, u16 power);
 void snd_wm8766_volume_restore(struct snd_wm8766 *wm);
 int snd_wm8766_build_controls(struct snd_wm8766 *wm);
 
-- 
1.7.10.4


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ALSA: ice1712: wm8766: Remove some unused functions
  2015-01-11 15:31 [PATCH] ALSA: ice1712: wm8766: Remove some unused functions Rickard Strandqvist
@ 2015-01-11 16:04 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2015-01-11 16:04 UTC (permalink / raw)
  To: Rickard Strandqvist; +Cc: Jaroslav Kysela, alsa-devel, linux-kernel

At Sun, 11 Jan 2015 16:31:40 +0100,
Rickard Strandqvist wrote:
> 
> Removes some functions that are not used anywhere:
> snd_wm8766_set_power() snd_wm8766_set_master_mode()
> 
> This was partially found by using a static code analysis program called cppcheck.
> 
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>

Applied, thanks.


Takashi

> ---
>  sound/pci/ice1712/wm8766.c |   16 ----------------
>  sound/pci/ice1712/wm8766.h |    2 --
>  2 files changed, 18 deletions(-)
> 
> diff --git a/sound/pci/ice1712/wm8766.c b/sound/pci/ice1712/wm8766.c
> index 21b373b..f7ac8d5 100644
> --- a/sound/pci/ice1712/wm8766.c
> +++ b/sound/pci/ice1712/wm8766.c
> @@ -183,22 +183,6 @@ void snd_wm8766_set_if(struct snd_wm8766 *wm, u16 dac)
>  	snd_wm8766_write(wm, WM8766_REG_IFCTRL, val | dac);
>  }
>  
> -void snd_wm8766_set_master_mode(struct snd_wm8766 *wm, u16 mode)
> -{
> -	u16 val = wm->regs[WM8766_REG_DACCTRL3] & ~WM8766_DAC3_MSTR_MASK;
> -
> -	mode &= WM8766_DAC3_MSTR_MASK;
> -	snd_wm8766_write(wm, WM8766_REG_DACCTRL3, val | mode);
> -}
> -
> -void snd_wm8766_set_power(struct snd_wm8766 *wm, u16 power)
> -{
> -	u16 val = wm->regs[WM8766_REG_DACCTRL3] & ~WM8766_DAC3_POWER_MASK;
> -
> -	power &= WM8766_DAC3_POWER_MASK;
> -	snd_wm8766_write(wm, WM8766_REG_DACCTRL3, val | power);
> -}
> -
>  void snd_wm8766_volume_restore(struct snd_wm8766 *wm)
>  {
>  	u16 val = wm->regs[WM8766_REG_DACR1];
> diff --git a/sound/pci/ice1712/wm8766.h b/sound/pci/ice1712/wm8766.h
> index c119f84..18c8d9d 100644
> --- a/sound/pci/ice1712/wm8766.h
> +++ b/sound/pci/ice1712/wm8766.h
> @@ -155,8 +155,6 @@ struct snd_wm8766 {
>  void snd_wm8766_init(struct snd_wm8766 *wm);
>  void snd_wm8766_resume(struct snd_wm8766 *wm);
>  void snd_wm8766_set_if(struct snd_wm8766 *wm, u16 dac);
> -void snd_wm8766_set_master_mode(struct snd_wm8766 *wm, u16 mode);
> -void snd_wm8766_set_power(struct snd_wm8766 *wm, u16 power);
>  void snd_wm8766_volume_restore(struct snd_wm8766 *wm);
>  int snd_wm8766_build_controls(struct snd_wm8766 *wm);
>  
> -- 
> 1.7.10.4
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-01-11 16:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-11 15:31 [PATCH] ALSA: ice1712: wm8766: Remove some unused functions Rickard Strandqvist
2015-01-11 16:04 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®