summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/dvb/av7110/av7110.h2
-rw-r--r--linux/drivers/media/dvb/av7110/saa7146_core.c2
-rw-r--r--linux/drivers/media/dvb/av7110/saa7146_core.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.c10
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.h8
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_i2c.c6
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_i2c.h6
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_net.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_net.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvbdev.c22
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvbdev.h12
13 files changed, 39 insertions, 39 deletions
diff --git a/linux/drivers/media/dvb/av7110/av7110.h b/linux/drivers/media/dvb/av7110/av7110.h
index 4d378c284..d96c21ae5 100644
--- a/linux/drivers/media/dvb/av7110/av7110.h
+++ b/linux/drivers/media/dvb/av7110/av7110.h
@@ -621,7 +621,7 @@ typedef struct av7110_s {
ring_buffer_t ci_wbuffer;
- dvb_adapter_t *dvb_adapter;
+ struct dvb_adapter *dvb_adapter;
struct dvb_device *video_dev;
struct dvb_device *audio_dev;
struct dvb_device *ca_dev;
diff --git a/linux/drivers/media/dvb/av7110/saa7146_core.c b/linux/drivers/media/dvb/av7110/saa7146_core.c
index 0ba82f9d1..4469d3a86 100644
--- a/linux/drivers/media/dvb/av7110/saa7146_core.c
+++ b/linux/drivers/media/dvb/av7110/saa7146_core.c
@@ -827,7 +827,7 @@ static
int __devinit saa7146_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
- struct dvb_adapter_s *adap;
+ struct dvb_adapter *adap;
struct saa7146 *saa;
int card_type;
struct card_info *cinfo= (struct card_info *) ent->driver_data;
diff --git a/linux/drivers/media/dvb/av7110/saa7146_core.h b/linux/drivers/media/dvb/av7110/saa7146_core.h
index ec3bd7598..0cd817412 100644
--- a/linux/drivers/media/dvb/av7110/saa7146_core.h
+++ b/linux/drivers/media/dvb/av7110/saa7146_core.h
@@ -38,7 +38,7 @@ struct saa7146 {
struct list_head list_head;
- dvb_adapter_t *dvb_adapter;
+ struct dvb_adapter *dvb_adapter;
struct dvb_i2c_bus *i2c_bus;
struct pci_dev *device;
int card_type;
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index c2fca219b..c1f3e7a97 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -1056,7 +1056,7 @@ static struct dvb_device dvbdev_dvr = {
};
int
-dvb_dmxdev_init(dmxdev_t *dmxdev, dvb_adapter_t *dvb_adapter)
+dvb_dmxdev_init(dmxdev_t *dmxdev, struct dvb_adapter *dvb_adapter)
{
int i;
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h
index 026147e3f..d37a9f706 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h
@@ -122,7 +122,7 @@ typedef struct dmxdev_s {
} dmxdev_t;
-int dvb_dmxdev_init(dmxdev_t *dmxdev, dvb_adapter_t *);
+int dvb_dmxdev_init(dmxdev_t *dmxdev, struct dvb_adapter *);
void dvb_dmxdev_release(dmxdev_t *dmxdev);
#endif /* _DMXDEV_H_ */
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 0890f16bf..10646a472 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -83,7 +83,7 @@ struct dvb_frontend_data {
struct dvb_frontend_ioctl_data {
struct list_head list_head;
- struct dvb_adapter_s *adapter;
+ struct dvb_adapter *adapter;
int (*before_ioctl) (struct dvb_frontend *frontend,
unsigned int cmd, void *arg);
int (*after_ioctl) (struct dvb_frontend *frontend,
@@ -661,7 +661,7 @@ int dvb_frontend_release (struct inode *inode, struct file *file)
int
-dvb_add_frontend_ioctls (struct dvb_adapter_s *adapter,
+dvb_add_frontend_ioctls (struct dvb_adapter *adapter,
int (*before_ioctl) (struct dvb_frontend *frontend,
unsigned int cmd, void *arg),
int (*after_ioctl) (struct dvb_frontend *frontend,
@@ -715,7 +715,7 @@ dvb_add_frontend_ioctls (struct dvb_adapter_s *adapter,
void
-dvb_remove_frontend_ioctls (struct dvb_adapter_s *adapter,
+dvb_remove_frontend_ioctls (struct dvb_adapter *adapter,
int (*before_ioctl) (struct dvb_frontend *frontend,
unsigned int cmd, void *arg),
int (*after_ioctl) (struct dvb_frontend *frontend,
@@ -748,7 +748,7 @@ dvb_remove_frontend_ioctls (struct dvb_adapter_s *adapter,
int
-dvb_add_frontend_notifier (struct dvb_adapter_s *adapter,
+dvb_add_frontend_notifier (struct dvb_adapter *adapter,
void (*callback) (fe_status_t s, void *data),
void *data)
{
@@ -791,7 +791,7 @@ dvb_add_frontend_notifier (struct dvb_adapter_s *adapter,
void
-dvb_remove_frontend_notifier (struct dvb_adapter_s *adapter,
+dvb_remove_frontend_notifier (struct dvb_adapter *adapter,
void (*callback) (fe_status_t s, void *data))
{
struct list_head *entry;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
index 9a65459e6..5c1950022 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -90,7 +90,7 @@ dvb_unregister_frontend (int (*ioctl) (struct dvb_frontend *frontend,
* Return value: number of frontends where the ioctl's were applied.
*/
extern int
-dvb_add_frontend_ioctls (struct dvb_adapter_s *adapter,
+dvb_add_frontend_ioctls (struct dvb_adapter *adapter,
int (*before_ioctl) (struct dvb_frontend *frontend,
unsigned int cmd, void *arg),
int (*after_ioctl) (struct dvb_frontend *frontend,
@@ -99,18 +99,18 @@ dvb_add_frontend_ioctls (struct dvb_adapter_s *adapter,
extern void
-dvb_remove_frontend_ioctls (struct dvb_adapter_s *adapter,
+dvb_remove_frontend_ioctls (struct dvb_adapter *adapter,
int (*before_ioctl) (struct dvb_frontend *frontend,
unsigned int cmd, void *arg),
int (*after_ioctl) (struct dvb_frontend *frontend,
unsigned int cmd, void *arg));
extern int
-dvb_add_frontend_notifier (struct dvb_adapter_s *adapter,
+dvb_add_frontend_notifier (struct dvb_adapter *adapter,
void (*callback) (fe_status_t s, void *data),
void *data);
extern void
-dvb_remove_frontend_notifier (struct dvb_adapter_s *adapter,
+dvb_remove_frontend_notifier (struct dvb_adapter *adapter,
void (*callback) (fe_status_t s, void *data));
#endif
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
index 7aae8c93d..e9a48ba1a 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
@@ -173,7 +173,7 @@ struct dvb_i2c_bus*
dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
struct i2c_msg msgs[], int num),
void *data,
- struct dvb_adapter_s *adapter,
+ struct dvb_adapter *adapter,
int id)
{
struct dvb_i2c_bus *i2c;
@@ -200,7 +200,7 @@ dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
struct dvb_i2c_bus*
dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
struct i2c_msg msgs[], int num),
- struct dvb_adapter_s *adapter,
+ struct dvb_adapter *adapter,
int id)
{
struct list_head *entry;
@@ -231,7 +231,7 @@ dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
void dvb_unregister_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
struct i2c_msg msgs[], int num),
- struct dvb_adapter_s *adapter,
+ struct dvb_adapter *adapter,
int id)
{
struct dvb_i2c_bus *i2c = dvb_find_i2c_bus (xfer, adapter, id);
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.h b/linux/drivers/media/dvb/dvb-core/dvb_i2c.h
index c06e4d1bc..137e9b155 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.h
@@ -32,7 +32,7 @@ struct dvb_i2c_bus {
struct list_head list_head;
int (*xfer) (struct dvb_i2c_bus *i2c, struct i2c_msg msgs[], int num);
void *data;
- struct dvb_adapter_s *adapter;
+ struct dvb_adapter *adapter;
int id;
struct list_head client_list;
};
@@ -43,13 +43,13 @@ struct dvb_i2c_bus* dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
struct i2c_msg msgs[],
int num),
void *data,
- struct dvb_adapter_s *adapter,
+ struct dvb_adapter *adapter,
int id);
extern
void dvb_unregister_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
struct i2c_msg msgs[], int num),
- struct dvb_adapter_s *adapter,
+ struct dvb_adapter *adapter,
int id);
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 60aa152f2..ec5e95a23 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -490,7 +490,7 @@ dvb_net_release(dvb_net_t *dvbnet)
}
int
-dvb_net_init(dvb_adapter_t *adap, dvb_net_t *dvbnet, dmx_demux_t *demux)
+dvb_net_init(struct dvb_adapter *adap, dvb_net_t *dvbnet, dmx_demux_t *demux)
{
int i;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.h b/linux/drivers/media/dvb/dvb-core/dvb_net.h
index 71ab9f297..16d270356 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.h
@@ -58,6 +58,6 @@ typedef struct dvb_net_s {
void dvb_net_release(dvb_net_t *);
-int dvb_net_init(dvb_adapter_t *, dvb_net_t *, dmx_demux_t *);
+int dvb_net_init(struct dvb_adapter *, dvb_net_t *, dmx_demux_t *);
#endif
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 4a2be16c5..090236858 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -75,8 +75,8 @@ struct dvb_device* dvbdev_find_device (int minor)
list_for_each (entry, &dvb_adapter_list) {
struct list_head *entry0;
- dvb_adapter_t *adap;
- adap = list_entry (entry, dvb_adapter_t, list_head);
+ struct dvb_adapter *adap;
+ adap = list_entry (entry, struct dvb_adapter, list_head);
list_for_each (entry0, &adap->device_list) {
struct dvb_device *dev;
dev = list_entry (entry0, struct dvb_device, list_head);
@@ -177,7 +177,7 @@ int dvb_generic_ioctl(struct inode *inode, struct file *file,
static
-int dvbdev_get_free_id (struct dvb_adapter_s *adap, int type)
+int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
{
u32 id = 0;
@@ -197,7 +197,7 @@ skip:
}
-int dvb_register_device(dvb_adapter_t *adap, struct dvb_device **pdvbdev,
+int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
struct dvb_device *template, void *priv, int type)
{
u32 id;
@@ -266,8 +266,8 @@ int dvbdev_get_free_adapter_num (void)
while (1) {
struct list_head *entry;
list_for_each (entry, &dvb_adapter_list) {
- dvb_adapter_t *adap;
- adap = list_entry (entry, dvb_adapter_t, list_head);
+ struct dvb_adapter *adap;
+ adap = list_entry (entry, struct dvb_adapter, list_head);
if (adap->num == num)
goto skip;
}
@@ -280,10 +280,10 @@ skip:
}
-int dvb_register_adapter(dvb_adapter_t **padap, char *name)
+int dvb_register_adapter(struct dvb_adapter **padap, char *name)
{
char dirname[10];
- dvb_adapter_t *adap;
+ struct dvb_adapter *adap;
int num;
if (down_interruptible (&dvbdev_register_lock))
@@ -294,12 +294,12 @@ int dvb_register_adapter(dvb_adapter_t **padap, char *name)
return -ENFILE;
}
- if (!(*padap = adap = kmalloc(sizeof(dvb_adapter_t), GFP_KERNEL))) {
+ if (!(*padap = adap = kmalloc(sizeof(struct dvb_adapter), GFP_KERNEL))) {
up(&dvbdev_register_lock);
return -ENOMEM;
}
- memset (adap, 0, sizeof(dvb_adapter_t));
+ memset (adap, 0, sizeof(struct dvb_adapter));
INIT_LIST_HEAD (&adap->device_list);
MOD_INC_USE_COUNT;
@@ -318,7 +318,7 @@ int dvb_register_adapter(dvb_adapter_t **padap, char *name)
}
-int dvb_unregister_adapter(dvb_adapter_t *adap)
+int dvb_unregister_adapter(struct dvb_adapter *adap)
{
devfs_unregister (adap->devfs_handle);
if (down_interruptible (&dvbdev_register_lock))
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h
index 90cbdf5f0..76bd217bc 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h
@@ -43,19 +43,19 @@
#define DVB_DEVICE_OSD 8
-typedef struct dvb_adapter_s {
+struct dvb_adapter {
int num;
devfs_handle_t devfs_handle;
struct list_head list_head;
struct list_head device_list;
-} dvb_adapter_t;
+};
struct dvb_device {
struct list_head list_head;
struct file_operations *fops;
devfs_handle_t devfs_handle;
- dvb_adapter_t *adapter;
+ struct dvb_adapter *adapter;
int type;
u32 id;
@@ -70,12 +70,12 @@ struct dvb_device {
};
-int dvb_register_device(dvb_adapter_t *adap, struct dvb_device **pdvbdev,
+int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
struct dvb_device *template, void *priv, int type);
void dvb_unregister_device(struct dvb_device *dvbdev);
-int dvb_register_adapter(dvb_adapter_t **padap, char *name);
-int dvb_unregister_adapter(dvb_adapter_t *adap);
+int dvb_register_adapter(struct dvb_adapter **padap, char *name);
+int dvb_unregister_adapter(struct dvb_adapter *adap);
int dvb_generic_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 08:51:14 +0000