Commit 0eaa21fd authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

[PATCH] media-radio: Maestro types change

__u16 --> u16 and so on
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6a2cf8ee
...@@ -101,18 +101,18 @@ static struct video_device maestro_radio = { ...@@ -101,18 +101,18 @@ static struct video_device maestro_radio = {
}; };
struct radio_device { struct radio_device {
__u16 io, /* base of Maestro card radio io (GPIO_DATA)*/ u16 io, /* base of Maestro card radio io (GPIO_DATA)*/
muted, /* VIDEO_AUDIO_MUTE */ muted, /* VIDEO_AUDIO_MUTE */
stereo, /* VIDEO_TUNER_STEREO_ON */ stereo, /* VIDEO_TUNER_STEREO_ON */
tuned; /* signal strength (0 or 0xffff) */ tuned; /* signal strength (0 or 0xffff) */
struct semaphore lock; struct semaphore lock;
}; };
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;
register __u32 data=0; register u32 data=0;
__u16 omask; u16 omask;
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);
...@@ -146,10 +146,10 @@ static __u32 radio_bits_get(struct radio_device *dev) ...@@ -146,10 +146,10 @@ static __u32 radio_bits_get(struct radio_device *dev)
return data & 0x3ffe; return data & 0x3ffe;
} }
static void radio_bits_set(struct radio_device *dev, __u32 data) static void radio_bits_set(struct radio_device *dev, u32 data)
{ {
register __u16 io=dev->io, l, bits; register u16 io=dev->io, l, bits;
__u16 omask, odir; u16 omask, odir;
omask = inw(io + IO_MASK); omask = inw(io + IO_MASK);
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN); odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
...@@ -229,8 +229,8 @@ static inline int radio_function(struct inode *inode, struct file *file, ...@@ -229,8 +229,8 @@ static inline int radio_function(struct inode *inode, struct file *file,
if (v->audio) if (v->audio)
return -EINVAL; return -EINVAL;
{ {
register __u16 io = card->io; register u16 io = card->io;
register __u16 omask = inw(io + IO_MASK); register u16 omask = inw(io + IO_MASK);
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);
...@@ -266,11 +266,11 @@ static int radio_ioctl(struct inode *inode, struct file *file, ...@@ -266,11 +266,11 @@ static int radio_ioctl(struct inode *inode, struct file *file,
return ret; return ret;
} }
static __u16 __devinit radio_power_on(struct radio_device *dev) static u16 __devinit radio_power_on(struct radio_device *dev)
{ {
register __u16 io = dev->io; register u16 io = dev->io;
register __u32 ofreq; register u32 ofreq;
__u16 omask, odir; u16 omask, odir;
omask = inw(io + IO_MASK); omask = inw(io + IO_MASK);
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN); odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
......
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