radio-aimslab.c: Fix gcc 4.5+ bug

commit e3c92215198cb6aa00ad38db2780faa6b72e0a3f upstream.

gcc 4.5+ doesn't properly evaluate some inlined expressions.
A previous patch were proposed by Andrew Morton using noinline.
However, the entire inlined function is bogus, so let's just
remove it and be happy.

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 1f064f4b32df6945c0d20262471784ddb94f7204..f17c89789b5770a2866532f6c0bf598243698c1f 100644 (file)
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -31,7 +31,6 @@
 #include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
-#include <linux/delay.h>       /* udelay                       */
 #include <asm/io.h>            /* outb, outb_p                 */
 #include <asm/uaccess.h>       /* copy to/from user            */
 #include <linux/videodev2.h>   /* kernel radio structs         */
@@ -60,27 +59,17 @@ struct rt_device
 
 /* local things */
 
-static void sleep_delay(long n)
-{
-       /* Sleep nicely for 'n' uS */
-       int d=n/msecs_to_jiffies(1000);
-       if(!d)
-               udelay(n);
-       else
-               msleep(jiffies_to_msecs(d));
-}
-
 static void rt_decvol(void)
 {
        outb(0x58, io);         /* volume down + sigstr + on    */
-       sleep_delay(100000);
+       msleep(100);
        outb(0xd8, io);         /* volume steady + sigstr + on  */
 }
 
 static void rt_incvol(void)
 {
        outb(0x98, io);         /* volume up + sigstr + on      */
-       sleep_delay(100000);
+       msleep(100);
        outb(0xd8, io);         /* volume steady + sigstr + on  */
 }
 
@@ -109,7 +98,7 @@ static int rt_setvol(struct rt_device *dev, int vol)
 
        if(vol == 0) {                  /* volume = 0 means mute the card */
                outb(0x48, io);         /* volume down but still "on"   */
-               sleep_delay(2000000);   /* make sure it's totally down  */
+               msleep(2000);           /* make sure it's totally down  */
                outb(0xd0, io);         /* volume steady, off           */
                dev->curvol = 0;        /* track the volume state!      */
                mutex_unlock(&lock);
@@ -144,7 +133,7 @@ static void send_0_byte(int port, struct rt_device *dev)
                outb_p(128+64+16+8+  1, port);  /* on + wr-enable + data low */
                outb_p(128+64+16+8+2+1, port);  /* clock */
        }
-       sleep_delay(1000);
+       msleep(1);
 }
 
 static void send_1_byte(int port, struct rt_device *dev)
@@ -158,7 +147,7 @@ static void send_1_byte(int port, struct rt_device *dev)
                outb_p(128+64+16+8+4+2+1, port); /* clock */
        }
 
-       sleep_delay(1000);
+       msleep(1);
 }
 
 static int rt_setfreq(struct rt_device *dev, unsigned long freq)
@@ -440,7 +429,7 @@ static int __init rtrack_init(void)
 
        /* this ensures that the volume is all the way down  */
        outb(0x48, io);         /* volume down but still "on"   */
-       sleep_delay(2000000);   /* make sure it's totally down  */
+       msleep(2000);           /* make sure it's totally down  */
        outb(0xc0, io);         /* steady volume, mute card     */
        rtrack_unit.curvol = 0;