aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJiri Slaby <xslaby@fi.muni.cz>2006-01-09 23:52:49 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:41 -0500
commit0eaa21fdfe2c50ba27456730cd8da8782cddaf6f (patch)
treebe36ce5c79f957aec77e2e510f0fb16eb04f38a7 /drivers/media
parent6a2cf8eed7f9c8dcc08785259cd179fcb317b120 (diff)
[PATCH] media-radio: Maestro types change
__u16 --> u16 and so on Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/radio/radio-maestro.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 84da5ad18bda..f662912ef8a1 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -101,18 +101,18 @@ static struct video_device maestro_radio = {
101}; 101};
102 102
103struct radio_device { 103struct radio_device {
104 __u16 io, /* base of Maestro card radio io (GPIO_DATA)*/ 104 u16 io, /* base of Maestro card radio io (GPIO_DATA)*/
105 muted, /* VIDEO_AUDIO_MUTE */ 105 muted, /* VIDEO_AUDIO_MUTE */
106 stereo, /* VIDEO_TUNER_STEREO_ON */ 106 stereo, /* VIDEO_TUNER_STEREO_ON */
107 tuned; /* signal strength (0 or 0xffff) */ 107 tuned; /* signal strength (0 or 0xffff) */
108 struct semaphore lock; 108 struct semaphore lock;
109}; 109};
110 110
111static __u32 radio_bits_get(struct radio_device *dev) 111static u32 radio_bits_get(struct radio_device *dev)
112{ 112{
113 register __u16 io=dev->io, l, rdata; 113 register u16 io=dev->io, l, rdata;
114 register __u32 data=0; 114 register u32 data=0;
115 __u16 omask; 115 u16 omask;
116 116
117 omask = inw(io + IO_MASK); 117 omask = inw(io + IO_MASK);
118 outw(~(STR_CLK | STR_WREN), io + IO_MASK); 118 outw(~(STR_CLK | STR_WREN), io + IO_MASK);
@@ -146,10 +146,10 @@ static __u32 radio_bits_get(struct radio_device *dev)
146 return data & 0x3ffe; 146 return data & 0x3ffe;
147} 147}
148 148
149static void radio_bits_set(struct radio_device *dev, __u32 data) 149static void radio_bits_set(struct radio_device *dev, u32 data)
150{ 150{
151 register __u16 io=dev->io, l, bits; 151 register u16 io=dev->io, l, bits;
152 __u16 omask, odir; 152 u16 omask, odir;
153 153
154 omask = inw(io + IO_MASK); 154 omask = inw(io + IO_MASK);
155 odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN); 155 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 if (v->audio) 229 if (v->audio)
230 return -EINVAL; 230 return -EINVAL;
231 { 231 {
232 register __u16 io = card->io; 232 register u16 io = card->io;
233 register __u16 omask = inw(io + IO_MASK); 233 register u16 omask = inw(io + IO_MASK);
234 outw(~STR_WREN, io + IO_MASK); 234 outw(~STR_WREN, io + IO_MASK);
235 outw((card->muted = v->flags & VIDEO_AUDIO_MUTE) ? 235 outw((card->muted = v->flags & VIDEO_AUDIO_MUTE) ?
236 STR_WREN : 0, io); 236 STR_WREN : 0, io);
@@ -266,11 +266,11 @@ static int radio_ioctl(struct inode *inode, struct file *file,
266 return ret; 266 return ret;
267} 267}
268 268
269static __u16 __devinit radio_power_on(struct radio_device *dev) 269static u16 __devinit radio_power_on(struct radio_device *dev)
270{ 270{
271 register __u16 io = dev->io; 271 register u16 io = dev->io;
272 register __u32 ofreq; 272 register u32 ofreq;
273 __u16 omask, odir; 273 u16 omask, odir;
274 274
275 omask = inw(io + IO_MASK); 275 omask = inw(io + IO_MASK);
276 odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN); 276 odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);