[alsa-devel] [PATCH] alsa: riptide: don't use own hex_to_bin() method

[Takashi Iwai]

At Tue, 15 Jun 2010 17:26:28 +0300,
Andy Shevchenko wrote:
> 
> From: Andy Shevchenko <ext-andriy.shevchenko at nokia.com>
> 
> Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko at nokia.com>
> Cc: Jaroslav Kysela <perex at perex.cz>
> Cc: Takashi Iwai <tiwai at suse.de>
> Cc: alsa-devel at alsa-project.org

Applied now.  Thanks.


Takashi

> ---
>  sound/pci/riptide/riptide.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
> index ad44626..59d7996 100644
> --- a/sound/pci/riptide/riptide.c
> +++ b/sound/pci/riptide/riptide.c
> @@ -97,6 +97,7 @@
>  #include <linux/gameport.h>
>  #include <linux/device.h>
>  #include <linux/firmware.h>
> +#include <linux/kernel.h>
>  #include <asm/io.h>
>  #include <sound/core.h>
>  #include <sound/info.h>
> @@ -667,13 +668,12 @@ static u32 atoh(const unsigned char *in, unsigned int len)
>  	unsigned char c;
>  
>  	while (len) {
> +		int value;
> +
>  		c = in[len - 1];
> -		if ((c >= '0') && (c <= '9'))
> -			sum += mult * (c - '0');
> -		else if ((c >= 'A') && (c <= 'F'))
> -			sum += mult * (c - ('A' - 10));
> -		else if ((c >= 'a') && (c <= 'f'))
> -			sum += mult * (c - ('a' - 10));
> +		value = hex_to_bin(c);
> +		if (value >= 0)
> +			sum += mult * value;
>  		mult *= 16;
>  		--len;
>  	}
> -- 
> 1.6.6.1
>