[PATCH] ice1724/revo: simple clean up

[PATCH] ice1724/revo: simple clean up

[Alexander Beregalov]

From: Alexander Beregalov <a.beregalov@gmail.com>

ice1724/revo: simple clean up


Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---

 sound/pci/ice1712/revo.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 4d26314..5e1b156 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -524,16 +524,20 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
 	ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
 	if (! ak)
 		return -ENOMEM;
-	ice->akm_codecs = 2;
 	switch (ice->eeprom.subvendor) {
 	case VT1724_SUBDEVICE_REVOLUTION71:
 		ice->akm_codecs = 2;
-		if ((err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front, &akm_revo_front_priv, ice)) < 0)
+		err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front,
+						&akm_revo_front_priv, ice);
+		if (err < 0)
 			return err;
-		if ((err = snd_ice1712_akm4xxx_init(ak + 1, &akm_revo_surround, &akm_revo_surround_priv, ice)) < 0)
+		err = snd_ice1712_akm4xxx_init(ak+1, &akm_revo_surround,
+						&akm_revo_surround_priv, ice);
+		if (err < 0)
 			return err;
 		/* unmute all codecs */
-		snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE, VT1724_REVO_MUTE);
+		snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE,
+						VT1724_REVO_MUTE);
 		break;
 	case VT1724_SUBDEVICE_REVOLUTION51:
 		ice->akm_codecs = 2;

Re: [alsa-devel] [PATCH] ice1724/revo: simple clean up

[Takashi Iwai]

At Mon, 11 Aug 2008 02:09:04 +0400,
Alexander Beregalov wrote:
> 
> From: Alexander Beregalov <a.beregalov@gmail.com>
> 
> ice1724/revo: simple clean up
> 
> 
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>

Applied.  Thanks.


> ---
> 
>  sound/pci/ice1712/revo.c |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
> index 4d26314..5e1b156 100644
> --- a/sound/pci/ice1712/revo.c
> +++ b/sound/pci/ice1712/revo.c
> @@ -524,16 +524,20 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
>  	ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
>  	if (! ak)
>  		return -ENOMEM;
> -	ice->akm_codecs = 2;
>  	switch (ice->eeprom.subvendor) {
>  	case VT1724_SUBDEVICE_REVOLUTION71:
>  		ice->akm_codecs = 2;
> -		if ((err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front, &akm_revo_front_priv, ice)) < 0)
> +		err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front,
> +						&akm_revo_front_priv, ice);
> +		if (err < 0)
>  			return err;
> -		if ((err = snd_ice1712_akm4xxx_init(ak + 1, &akm_revo_surround, &akm_revo_surround_priv, ice)) < 0)
> +		err = snd_ice1712_akm4xxx_init(ak+1, &akm_revo_surround,
> +						&akm_revo_surround_priv, ice);
> +		if (err < 0)
>  			return err;
>  		/* unmute all codecs */
> -		snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE, VT1724_REVO_MUTE);
> +		snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE,
> +						VT1724_REVO_MUTE);
>  		break;
>  	case VT1724_SUBDEVICE_REVOLUTION51:
>  		ice->akm_codecs = 2;
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>