Commit fdfdc023 authored by Maximilian Attems's avatar Maximilian Attems Committed by Linus Torvalds

[PATCH] radio/radio-maestro: replace schedule_timeout() with msleep()

Replaced sleep_125ms() with msleep(125), udelay2() with udelay(2),
udelay4() with udelay(4) and udelay16() with udelay(16) and removed the
replaced functions' definitions.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0a75b8a8
...@@ -93,27 +93,6 @@ static struct radio_device ...@@ -93,27 +93,6 @@ static struct radio_device
struct semaphore lock; struct semaphore lock;
} radio_unit = {0, 0, 0, 0, }; } radio_unit = {0, 0, 0, 0, };
static void sleep_125ms(void)
{
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ >> 3);
}
static void udelay2(void)
{
udelay(2);
}
static void udelay4(void)
{
udelay(4);
}
static void udelay16(void)
{
udelay(16);
}
static __u32 radio_bits_get(struct radio_device *dev) static __u32 radio_bits_get(struct radio_device *dev)
{ {
register __u16 io=dev->io, l, rdata; register __u16 io=dev->io, l, rdata;
...@@ -122,14 +101,15 @@ static __u32 radio_bits_get(struct radio_device *dev) ...@@ -122,14 +101,15 @@ static __u32 radio_bits_get(struct radio_device *dev)
omask = inw(io + IO_MASK); omask = inw(io + IO_MASK);
outw(~(STR_CLK | STR_WREN), io + IO_MASK); outw(~(STR_CLK | STR_WREN), io + IO_MASK);
outw(0, io); outw(0, io);
udelay16(); udelay(16);
for (l=24;l--;) { for (l=24;l--;) {
outw(STR_CLK, io); /* HI state */ outw(STR_CLK, io); /* HI state */
udelay2(); udelay(2);
if(!l) if(!l)
dev->tuned = inw(io) & STR_MOST ? 0 : 0xffff; dev->tuned = inw(io) & STR_MOST ? 0 : 0xffff;
outw(0, io); /* LO state */ outw(0, io); /* LO state */
udelay2(); udelay(2);
data <<= 1; /* shift data */ data <<= 1; /* shift data */
rdata = inw(io); rdata = inw(io);
if(!l) if(!l)
...@@ -138,11 +118,11 @@ static __u32 radio_bits_get(struct radio_device *dev) ...@@ -138,11 +118,11 @@ static __u32 radio_bits_get(struct radio_device *dev)
else else
if(rdata & STR_DATA) if(rdata & STR_DATA)
data++; data++;
udelay2(); udelay(2);
} }
if(dev->muted) if(dev->muted)
outw(STR_WREN, io); outw(STR_WREN, io);
udelay4(); udelay(4);
outw(omask, io + IO_MASK); outw(omask, io + IO_MASK);
return data & 0x3ffe; return data & 0x3ffe;
} }
...@@ -155,23 +135,23 @@ static void radio_bits_set(struct radio_device *dev, __u32 data) ...@@ -155,23 +135,23 @@ static void radio_bits_set(struct radio_device *dev, __u32 data)
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN); odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
outw(odir | STR_DATA, io + IO_DIR); outw(odir | STR_DATA, io + IO_DIR);
outw(~(STR_DATA | STR_CLK | STR_WREN), io + IO_MASK); outw(~(STR_DATA | STR_CLK | STR_WREN), io + IO_MASK);
udelay16(); udelay(16);
for (l=25;l;l--) { for (l=25;l;l--) {
bits = ((data >> 18) & STR_DATA) | STR_WREN ; bits = ((data >> 18) & STR_DATA) | STR_WREN ;
data <<= 1; /* shift data */ data <<= 1; /* shift data */
outw(bits, io); /* start strobe */ outw(bits, io); /* start strobe */
udelay2(); udelay(2);
outw(bits | STR_CLK, io); /* HI level */ outw(bits | STR_CLK, io); /* HI level */
udelay2(); udelay(2);
outw(bits, io); /* LO level */ outw(bits, io); /* LO level */
udelay4(); udelay(4);
} }
if(!dev->muted) if(!dev->muted)
outw(0, io); outw(0, io);
udelay4(); udelay(4);
outw(omask, io + IO_MASK); outw(omask, io + IO_MASK);
outw(odir, io + IO_DIR); outw(odir, io + IO_DIR);
sleep_125ms(); msleep(125);
} }
inline static int radio_function(struct inode *inode, struct file *file, inline static int radio_function(struct inode *inode, struct file *file,
...@@ -238,9 +218,9 @@ inline static int radio_function(struct inode *inode, struct file *file, ...@@ -238,9 +218,9 @@ inline static int radio_function(struct inode *inode, struct file *file,
outw(~STR_WREN, io + IO_MASK); outw(~STR_WREN, io + IO_MASK);
outw((card->muted = v->flags & VIDEO_AUDIO_MUTE) outw((card->muted = v->flags & VIDEO_AUDIO_MUTE)
? STR_WREN : 0, io); ? STR_WREN : 0, io);
udelay4(); udelay(4);
outw(omask, io + IO_MASK); outw(omask, io + IO_MASK);
sleep_125ms(); msleep(125);
return 0; return 0;
} }
} }
...@@ -315,7 +295,7 @@ inline static __u16 radio_power_on(struct radio_device *dev) ...@@ -315,7 +295,7 @@ inline static __u16 radio_power_on(struct radio_device *dev)
outw(odir, io + IO_DIR); outw(odir, io + IO_DIR);
outw(~(STR_WREN | STR_CLK), io + IO_MASK); outw(~(STR_WREN | STR_CLK), io + IO_MASK);
outw(dev->muted ? 0 : STR_WREN, io); outw(dev->muted ? 0 : STR_WREN, io);
udelay16(); udelay(16);
outw(omask, io + IO_MASK); outw(omask, io + IO_MASK);
ofreq = radio_bits_get(dev); ofreq = radio_bits_get(dev);
if((ofreq<FREQ2BITS(FREQ_LO)) || (ofreq>FREQ2BITS(FREQ_HI))) if((ofreq<FREQ2BITS(FREQ_LO)) || (ofreq>FREQ2BITS(FREQ_HI)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment