[media] saa6588: rename rds.h to saa6588.h

The naming of the media/rds.h header suggested that it was a generic
RDS header, when in fact it is just a saa6588 module API that is
internal to the kernel.

Rename the header and the struct and defines in it to make this clear.

Also removed the header include in radio-si470x.h (not used anymore)
and from ioctl-number.txt (it's internal to the kernel and never called
from userspace).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index b2400d7296ce8f6037248a530bf86542ee2da601..7edf95014e8560e707816baaf6112b1c31765e87 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -155,7 +155,6 @@ Code  Seq#(hex)     Include File            Comments
 'Q'    all     linux/soundcard.h
 'R'    00-1F   linux/random.h          conflict!
 'R'    01      linux/rfkill.h          conflict!
-'R'    01-0F   media/rds.h             conflict!
 'R'    C0-DF   net/bluetooth/rfcomm.h
 'S'    all     linux/cdrom.h           conflict!
 'S'    80-81   scsi/scsi_ioctl.h       conflict!

diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index b9914d7a0c9ffeef06a0b7f02bd2f82c10f1dd9f..4a4e908db04c6769b2f6df8e221a4fc6997785de 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -37,7 +37,6 @@
 #include <linux/mutex.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
-#include <media/rds.h>
 #include <asm/unaligned.h>
 
 

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 961d0805d877450fbf957dd19c92dab0cde16813..849cd170b821d7fd4646a33b8cd05c517cf9e28a 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -55,7 +55,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
-#include <media/rds.h>
+#include <media/saa6588.h>
 
 
 unsigned int bttv_num;                 /* number of Bt848s in use */
@@ -3388,7 +3388,7 @@ static int radio_release(struct file *file)
 {
        struct bttv_fh *fh = file->private_data;
        struct bttv *btv = fh->btv;
-       struct rds_command cmd;
+       struct saa6588_command cmd;
 
        v4l2_prio_close(&btv->prio, fh->prio);
        file->private_data = NULL;
@@ -3396,7 +3396,7 @@ static int radio_release(struct file *file)
 
        btv->radio_user--;
 
-       bttv_call_all(btv, core, ioctl, RDS_CMD_CLOSE, &cmd);
+       bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
        return 0;
 }
@@ -3523,13 +3523,13 @@ static ssize_t radio_read(struct file *file, char __user *data,
 {
        struct bttv_fh *fh = file->private_data;
        struct bttv *btv = fh->btv;
-       struct rds_command cmd;
+       struct saa6588_command cmd;
        cmd.block_count = count/3;
        cmd.buffer = data;
        cmd.instance = file;
        cmd.result = -ENODEV;
 
-       bttv_call_all(btv, core, ioctl, RDS_CMD_READ, &cmd);
+       bttv_call_all(btv, core, ioctl, SAA6588_CMD_READ, &cmd);
 
        return cmd.result;
 }
@@ -3538,11 +3538,11 @@ static unsigned int radio_poll(struct file *file, poll_table *wait)
 {
        struct bttv_fh *fh = file->private_data;
        struct bttv *btv = fh->btv;
-       struct rds_command cmd;
+       struct saa6588_command cmd;
        cmd.instance = file;
        cmd.event_list = wait;
        cmd.result = -ENODEV;
-       bttv_call_all(btv, core, ioctl, RDS_CMD_POLL, &cmd);
+       bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd);
 
        return cmd.result;
 }

diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 984c0feb2a4ebb87d1f399d7888c7261ed4c0bfe..99a2ac16f9e528ef3490a655fe37f8d0294b8a9b 100644 (file)
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -31,7 +31,7 @@
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 
-#include <media/rds.h>
+#include <media/saa6588.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
 
@@ -181,7 +181,7 @@ static int block_to_user_buf(struct saa6588 *s, unsigned char __user *user_buf)
        return 1;
 }
 
-static void read_from_buf(struct saa6588 *s, struct rds_command *a)
+static void read_from_buf(struct saa6588 *s, struct saa6588_command *a)
 {
        unsigned long flags;
 
@@ -392,25 +392,25 @@ static void saa6588_configure(struct saa6588 *s)
 static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
 {
        struct saa6588 *s = to_saa6588(sd);
-       struct rds_command *a = arg;
+       struct saa6588_command *a = arg;
 
        switch (cmd) {
                /* --- open() for /dev/radio --- */
-       case RDS_CMD_OPEN:
+       case SAA6588_CMD_OPEN:
                a->result = 0;  /* return error if chip doesn't work ??? */
                break;
                /* --- close() for /dev/radio --- */
-       case RDS_CMD_CLOSE:
+       case SAA6588_CMD_CLOSE:
                s->data_available_for_read = 1;
                wake_up_interruptible(&s->read_queue);
                a->result = 0;
                break;
                /* --- read() for /dev/radio --- */
-       case RDS_CMD_READ:
+       case SAA6588_CMD_READ:
                read_from_buf(s, a);
                break;
                /* --- poll() for /dev/radio --- */
-       case RDS_CMD_POLL:
+       case SAA6588_CMD_POLL:
                a->result = 0;
                if (s->data_available_for_read) {
                        a->result |= POLLIN | POLLRDNORM;

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index ad22be27bd38fcc9716778b7ad28de85c7787214..ee4ea5f001a83a6e512d35a7b422582762f1d37c 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -30,7 +30,7 @@
 #include "saa7134-reg.h"
 #include "saa7134.h"
 #include <media/v4l2-common.h>
-#include <media/rds.h>
+#include <media/saa6588.h>
 
 /* ------------------------------------------------------------------ */
 
@@ -1459,7 +1459,7 @@ static int video_release(struct file *file)
 {
        struct saa7134_fh  *fh  = file->private_data;
        struct saa7134_dev *dev = fh->dev;
-       struct rds_command cmd;
+       struct saa6588_command cmd;
        unsigned long flags;
 
        /* turn off overlay */
@@ -1494,7 +1494,7 @@ static int video_release(struct file *file)
 
        saa_call_all(dev, core, s_power, 0);
        if (fh->radio)
-               saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd);
+               saa_call_all(dev, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
        /* free stuff */
        videobuf_mmap_free(&fh->cap);
@@ -1520,14 +1520,14 @@ static ssize_t radio_read(struct file *file, char __user *data,
 {
        struct saa7134_fh *fh = file->private_data;
        struct saa7134_dev *dev = fh->dev;
-       struct rds_command cmd;
+       struct saa6588_command cmd;
 
        cmd.block_count = count/3;
        cmd.buffer = data;
        cmd.instance = file;
        cmd.result = -ENODEV;
 
-       saa_call_all(dev, core, ioctl, RDS_CMD_READ, &cmd);
+       saa_call_all(dev, core, ioctl, SAA6588_CMD_READ, &cmd);
 
        return cmd.result;
 }
@@ -1536,12 +1536,12 @@ static unsigned int radio_poll(struct file *file, poll_table *wait)
 {
        struct saa7134_fh *fh = file->private_data;
        struct saa7134_dev *dev = fh->dev;
-       struct rds_command cmd;
+       struct saa6588_command cmd;
 
        cmd.instance = file;
        cmd.event_list = wait;
        cmd.result = -ENODEV;
-       saa_call_all(dev, core, ioctl, RDS_CMD_POLL, &cmd);
+       saa_call_all(dev, core, ioctl, SAA6588_CMD_POLL, &cmd);
 
        return cmd.result;
 }

diff --git a/include/media/rds.h b/include/media/saa6588.h
similarity index 76%
rename from include/media/rds.h
rename to include/media/saa6588.h
index a89426667618a42046a592b2f76e9c8262a1a19f..2c3c4420a4eb61e42ed0cd8c8606b5a8a32766cd 100644 (file)
--- a/include/media/rds.h
+++ b/include/media/saa6588.h
@@ -4,9 +4,6 @@
     saa6588.c and every driver (e.g. bttv-driver.c) that wants
     to use the saa6588 module.
 
-    Instead of having a separate rds.h, I'd prefer to include
-    this stuff in one of the already existing files like tuner.h
-
     (c) 2005 by Hans J. Koch
 
     This program is free software; you can redistribute it and/or modify
@@ -25,10 +22,10 @@
 
 */
 
-#ifndef _RDS_H
-#define _RDS_H
+#ifndef _SAA6588_H
+#define _SAA6588_H
 
-struct rds_command {
+struct saa6588_command {
        unsigned int  block_count;
        int           result;
        unsigned char __user *buffer;
@@ -36,9 +33,10 @@ struct rds_command {
        poll_table    *event_list;
 };
 
-#define RDS_CMD_OPEN   _IOW('R',1,int)
-#define RDS_CMD_CLOSE  _IOW('R',2,int)
-#define RDS_CMD_READ   _IOR('R',3,int)
-#define RDS_CMD_POLL   _IOR('R',4,int)
+/* These ioctls are internal to the kernel */
+#define SAA6588_CMD_OPEN       _IOW('R', 1, int)
+#define SAA6588_CMD_CLOSE      _IOW('R', 2, int)
+#define SAA6588_CMD_READ       _IOR('R', 3, int)
+#define SAA6588_CMD_POLL       _IOR('R', 4, int)
 
 #endif