2 files changed, 23 insertions, 33 deletions

diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 964b97e70c84..986df35fb829 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -168,7 +168,7 @@ typedef struct _snd_uart16550 {
 
 static snd_card_t *snd_serial_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 
-inline static void snd_uart16550_add_timer(snd_uart16550_t *uart)
+static inline void snd_uart16550_add_timer(snd_uart16550_t *uart)
 {
         if (! uart->timer_running) {
                 /* timer 38600bps * 10bit * 16byte */
@@ -178,7 +178,7 @@ inline static void snd_uart16550_add_timer(snd_uart16550_t *uart)
         }
 }
 
-inline static void snd_uart16550_del_timer(snd_uart16550_t *uart)
+static inline void snd_uart16550_del_timer(snd_uart16550_t *uart)
 {
         if (uart->timer_running) {
                 del_timer(&uart->buffer_timer);
@@ -187,7 +187,7 @@ inline static void snd_uart16550_del_timer(snd_uart16550_t *uart)
 }
 
 /* This macro is only used in snd_uart16550_io_loop */
-inline static void snd_uart16550_buffer_output(snd_uart16550_t *uart)
+static inline void snd_uart16550_buffer_output(snd_uart16550_t *uart)
 {
         unsigned short buff_out = uart->buff_out;
         if( uart->buff_in_count > 0 ) {
@@ -579,7 +579,7 @@ static int snd_uart16550_output_close(snd_rawmidi_substream_t * substream)
         return 0;
 };
 
-inline static int snd_uart16550_buffer_can_write( snd_uart16550_t *uart, int Num )
+static inline int snd_uart16550_buffer_can_write( snd_uart16550_t *uart, int Num )
 {
         if( uart->buff_in_count + Num < TX_BUFF_SIZE )
                 return 1;
@@ -587,7 +587,7 @@ inline static int snd_uart16550_buffer_can_write( snd_uart16550_t *uart, int Num
                 return 0;
 }
 
-inline static int snd_uart16550_write_buffer(snd_uart16550_t *uart, unsigned char byte)
+static inline int snd_uart16550_write_buffer(snd_uart16550_t *uart, unsigned char byte)
 {
         unsigned short buff_in = uart->buff_in;
         if( uart->buff_in_count < TX_BUFF_SIZE ) {
diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c
index 18114713c3b3..4fc38bde34f4 100644
--- a/sound/drivers/vx/vx_uer.c
+++ b/sound/drivers/vx/vx_uer.c
@@ -162,34 +162,24 @@ static int vx_read_uer_status(vx_core_t *chip, int *mode)
 
 static int vx_calc_clock_from_freq(vx_core_t *chip, int freq)
 {
-#define XX_FECH48000                    0x0000004B
-#define XX_FECH32000                    0x00000171
-#define XX_FECH24000                    0x0000024B
-#define XX_FECH16000                    0x00000371
-#define XX_FECH12000                    0x0000044B
-#define XX_FECH8000                     0x00000571
-#define XX_FECH44100                    0x0000007F
-#define XX_FECH29400                    0x0000016F
-#define XX_FECH22050                    0x0000027F
-#define XX_FECH14000                    0x000003EF
-#define XX_FECH11025                    0x0000047F
-#define XX_FECH7350                     0x000005BF
-
-        switch (freq) {
-        case 48000:     return XX_FECH48000;
-        case 44100:     return XX_FECH44100;
-        case 32000:     return XX_FECH32000;
-        case 29400:     return XX_FECH29400;
-        case 24000:     return XX_FECH24000;
-        case 22050:     return XX_FECH22050;
-        case 16000:     return XX_FECH16000;
-        case 14000:     return XX_FECH14000;
-        case 12000:     return XX_FECH12000;
-        case 11025:     return XX_FECH11025;
-        case 8000:      return XX_FECH8000;
-        case 7350:      return XX_FECH7350;
-        default:        return freq;   /* The value is already correct */
-        }
+        int hexfreq;
+
+        snd_assert(freq > 0, return 0);
+
+        hexfreq = (28224000 * 10) / freq;
+        hexfreq = (hexfreq + 5) / 10;
+
+        /* max freq = 55125 Hz */
+        snd_assert(hexfreq > 0x00000200, return 0);
+
+        if (hexfreq <= 0x03ff)
+                return hexfreq - 0x00000201;
+        if (hexfreq <= 0x07ff) 
+                return (hexfreq / 2) - 1;
+        if (hexfreq <= 0x0fff)
+                return (hexfreq / 4) + 0x000001ff;
+
+        return 0x5fe;   /* min freq = 6893 Hz */
 }