[PATCH 3/4] media-radio: Maestro types change
- From: "Jiri Slaby" <xslaby@xxxxxxxxxx>
- Date: Sat, 31 Dec 2005 17:16:35 +0100
Maestro types change
[depends on Maestro Lindent]
__u16 --> u16 and so on
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
---
commit a6bf47a35d16fad6207effb37532466c57d20b28
tree 52defb3f608ab7309dac7fd63717f3f811bc98b3
parent f3f0d3e94b346e181a62de564506db1be00bb8ef
author <ku@bellona.(none)> Sat, 31 Dec 2005 17:01:25 +0100
committer <ku@bellona.(none)> Sat, 31 Dec 2005 17:01:25 +0100
drivers/media/radio/radio-maestro.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -103,18 +103,18 @@ static struct video_device maestro_radio
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 */
stereo, /* VIDEO_TUNER_STEREO_ON */
tuned; /* signal strength (0 or 0xffff) */
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 __u32 data=0;
- __u16 omask;
+ register u16 io=dev->io, l, rdata;
+ register u32 data=0;
+ u16 omask;
omask = inw(io + IO_MASK);
outw(~(STR_CLK | STR_WREN), io + IO_MASK);
@@ -148,10 +148,10 @@ static __u32 radio_bits_get(struct radio
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;
- __u16 omask, odir;
+ register u16 io=dev->io, l, bits;
+ u16 omask, odir;
omask = inw(io + IO_MASK);
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
@@ -231,8 +231,8 @@ static inline int radio_function(struct
if (v->audio)
return -EINVAL;
{
- register __u16 io = card->io;
- register __u16 omask = inw(io + IO_MASK);
+ register u16 io = card->io;
+ register u16 omask = inw(io + IO_MASK);
outw(~STR_WREN, io + IO_MASK);
outw((card->muted = v->flags & VIDEO_AUDIO_MUTE) ?
STR_WREN : 0, io);
@@ -268,11 +268,11 @@ static int radio_ioctl(struct inode *ino
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 __u32 ofreq;
- __u16 omask, odir;
+ register u16 io = dev->io;
+ register u32 ofreq;
+ u16 omask, odir;
omask = inw(io + IO_MASK);
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- References:
- [PATCH 0/4] maestro radio driver rewritten to 2.6 pci api
- From: Jiri Slaby
- [PATCH 0/4] maestro radio driver rewritten to 2.6 pci api
- Prev by Date: Re: Possible bug in amd64-agp (agpgart module)
- Next by Date: [PATCH 0/4] maestro radio driver rewritten to 2.6 pci api
- Previous by thread: [PATCH 0/4] maestro radio driver rewritten to 2.6 pci api
- Next by thread: [PATCH 1/4] media-radio: Pci probing for maestro radio
- Index(es):
Relevant Pages
|
