summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-core
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
-rw-r--r--linux/drivers/media/dvb/dvb-core/demux.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.c97
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.h4
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_demux.c83
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_demux.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_filter.c36
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.c58
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_i2c.c29
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_ksyms.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_net.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvbdev.c21
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvbdev.h2
14 files changed, 121 insertions, 221 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/demux.h b/linux/drivers/media/dvb/dvb-core/demux.h
index 550a5db83..3700ecc22 100644
--- a/linux/drivers/media/dvb/dvb-core/demux.h
+++ b/linux/drivers/media/dvb/dvb-core/demux.h
@@ -25,7 +25,7 @@
#ifndef __DEMUX_H
#define __DEMUX_H
-#include <asm/types.h>
+#include <linux/types.h>
#include <linux/errno.h>
#include <linux/list.h>
#include <linux/time.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index 74f6d9698..a4a1db259 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -21,8 +21,6 @@
*
*/
-#include <asm/uaccess.h>
-#include <asm/system.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -31,6 +29,8 @@
#include <linux/poll.h>
#include <linux/ioctl.h>
#include <linux/wait.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
#include "dmxdev.h"
#include "dvb_functions.h"
@@ -52,8 +52,7 @@ dvb_dmxdev_file_to_dvr(struct dmxdev *dmxdev, struct file *file)
return (struct dmxdev_dvr *) file->private_data;
}
-static inline void
-dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer)
+static inline void dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer)
{
buffer->data=0;
buffer->size=8192;
@@ -63,8 +62,7 @@ dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer)
init_waitqueue_head(&buffer->queue);
}
-static inline
-int dvb_dmxdev_buffer_write(struct dmxdev_buffer *buf, const u8 *src, int len)
+static inline int dvb_dmxdev_buffer_write(struct dmxdev_buffer *buf, const u8 *src, int len)
{
int split;
int free;
@@ -98,9 +96,8 @@ int dvb_dmxdev_buffer_write(struct dmxdev_buffer *buf, const u8 *src, int len)
return len;
}
-static ssize_t
-dvb_dmxdev_buffer_read(struct dmxdev_buffer *src, int non_blocking,
- char *buf, size_t count, loff_t *ppos)
+static ssize_t dvb_dmxdev_buffer_read(struct dmxdev_buffer *src,
+ int non_blocking, char *buf, size_t count, loff_t *ppos)
{
unsigned long todo=count;
int split, avail, error;
@@ -159,8 +156,7 @@ dvb_dmxdev_buffer_read(struct dmxdev_buffer *src, int non_blocking,
return count;
}
-static struct dmx_frontend *
-get_fe(struct dmx_demux *demux, int type)
+static struct dmx_frontend * get_fe(struct dmx_demux *demux, int type)
{
struct list_head *head, *pos;
@@ -174,8 +170,7 @@ get_fe(struct dmx_demux *demux, int type)
return 0;
}
-static inline void
-dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int state)
+static inline void dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int state)
{
spin_lock_irq(&dmxdevdvr->dev->lock);
dmxdevdvr->state=state;
@@ -258,8 +253,8 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
return 0;
}
-static ssize_t
-dvb_dvr_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+static ssize_t dvb_dvr_write(struct file *file, const char *buf,
+ size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
@@ -276,8 +271,8 @@ dvb_dvr_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
return ret;
}
-static ssize_t
-dvb_dvr_read(struct file *file, char *buf, size_t count, loff_t *ppos)
+static ssize_t dvb_dvr_read(struct file *file, char *buf, size_t count,
+ loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
@@ -291,16 +286,14 @@ dvb_dvr_read(struct file *file, char *buf, size_t count, loff_t *ppos)
return ret;
}
-static inline void
-dvb_dmxdev_filter_state_set(struct dmxdev_filter *dmxdevfilter, int state)
+static inline void dvb_dmxdev_filter_state_set(struct dmxdev_filter *dmxdevfilter, int state)
{
spin_lock_irq(&dmxdevfilter->dev->lock);
dmxdevfilter->state=state;
spin_unlock_irq(&dmxdevfilter->dev->lock);
}
-static int
-dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsigned long size)
+static int dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsigned long size)
{
struct dmxdev_buffer *buf=&dmxdevfilter->buffer;
void *mem;
@@ -329,8 +322,7 @@ dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsigned long siz
return 0;
}
-static void
-dvb_dmxdev_filter_timeout(unsigned long data)
+static void dvb_dmxdev_filter_timeout(unsigned long data)
{
struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *)data;
@@ -341,8 +333,7 @@ dvb_dmxdev_filter_timeout(unsigned long data)
wake_up(&dmxdevfilter->buffer.queue);
}
-static void
-dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
+static void dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
{
struct dmx_sct_filter_params *para=&dmxdevfilter->params.sec;
@@ -355,8 +346,7 @@ dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
}
}
-static int
-dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
+static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
struct dmx_section_filter *filter, enum dmx_success success)
{
@@ -392,8 +382,7 @@ dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
return 0;
}
-static int
-dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
+static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
struct dmx_ts_feed *feed, enum dmx_success success)
{
@@ -431,8 +420,7 @@ dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
/* stop feed but only mark the specified filter as stopped (state set) */
-static int
-dvb_dmxdev_feed_stop(struct dmxdev_filter *dmxdevfilter)
+static int dvb_dmxdev_feed_stop(struct dmxdev_filter *dmxdevfilter)
{
dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_SET);
@@ -453,8 +441,7 @@ dvb_dmxdev_feed_stop(struct dmxdev_filter *dmxdevfilter)
/* start feed associated with the specified filter */
-static
-int dvb_dmxdev_feed_start(struct dmxdev_filter *filter)
+static int dvb_dmxdev_feed_start(struct dmxdev_filter *filter)
{
dvb_dmxdev_filter_state_set (filter, DMXDEV_STATE_GO);
@@ -476,8 +463,7 @@ int dvb_dmxdev_feed_start(struct dmxdev_filter *filter)
/* restart section feed if it has filters left associated with it,
otherwise release the feed */
-static
-int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
+static int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
{
int i;
struct dmxdev *dmxdev = filter->dev;
@@ -496,8 +482,7 @@ int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
return 0;
}
-static int
-dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
+static int dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
{
if (dmxdevfilter->state<DMXDEV_STATE_GO)
return 0;
@@ -532,8 +517,7 @@ dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
return 0;
}
-static inline int
-dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
+static inline int dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
{
if (dmxdevfilter->state<DMXDEV_STATE_SET)
return 0;
@@ -544,8 +528,7 @@ dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
return 0;
}
-static int
-dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
+static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
{
struct dmxdev *dmxdev = filter->dev;
void *mem;
@@ -742,8 +725,7 @@ static int dvb_demux_open(struct inode *inode, struct file *file)
}
-static
-int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfilter)
+static int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfilter)
{
if (down_interruptible(&dmxdev->mutex))
return -ERESTARTSYS;
@@ -772,8 +754,7 @@ int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfi
return 0;
}
-static inline void
-invert_mode(dmx_filter_t *filter)
+static inline void invert_mode(dmx_filter_t *filter)
{
int i;
@@ -782,8 +763,7 @@ invert_mode(dmx_filter_t *filter)
}
-static int
-dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
+static int dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
struct dmxdev_filter *dmxdevfilter,
struct dmx_sct_filter_params *params)
{
@@ -804,8 +784,7 @@ dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
return 0;
}
-static int
-dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
+static int dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
struct dmxdev_filter *dmxdevfilter,
struct dmx_pes_filter_params *params)
{
@@ -826,9 +805,8 @@ dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
return 0;
}
-static ssize_t
-dvb_dmxdev_read_sec(struct dmxdev_filter *dfil, struct file *file,
- char *buf, size_t count, loff_t *ppos)
+static ssize_t dvb_dmxdev_read_sec(struct dmxdev_filter *dfil,
+ struct file *file, char *buf, size_t count, loff_t *ppos)
{
int result, hcount;
int done=0;
@@ -985,8 +963,7 @@ static int dvb_demux_ioctl(struct inode *inode, struct file *file,
}
-static
-unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
+static unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
{
struct dmxdev_filter *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
unsigned int mask = 0;
@@ -1011,8 +988,7 @@ unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
}
-static
-int dvb_demux_release(struct inode *inode, struct file *file)
+static int dvb_demux_release(struct inode *inode, struct file *file)
{
struct dmxdev_filter *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
struct dmxdev *dmxdev = dmxdevfilter->dev;
@@ -1071,8 +1047,7 @@ static int dvb_dvr_ioctl(struct inode *inode, struct file *file,
}
-static
-unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
+static unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
{
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct dmxdev *dmxdev = (struct dmxdev *) dvbdev->priv;
@@ -1095,8 +1070,7 @@ unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
}
-static
-struct file_operations dvb_dvr_fops = {
+static struct file_operations dvb_dvr_fops = {
.owner = THIS_MODULE,
.read = dvb_dvr_read,
.write = dvb_dvr_write,
@@ -1106,8 +1080,7 @@ struct file_operations dvb_dvr_fops = {
.poll = dvb_dvr_poll,
};
-static
-struct dvb_device dvbdev_dvr = {
+static struct dvb_device dvbdev_dvr = {
.priv = 0,
.users = 1,
.writers = 1,
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h
index b448cda04..6af08a5e6 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h
@@ -24,14 +24,14 @@
#ifndef _DMXDEV_H_
#define _DMXDEV_H_
-#include <asm/types.h>
-#include <asm/semaphore.h>
+#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
#include <linux/timer.h>
#include <linux/wait.h>
#include <linux/fs.h>
#include <linux/string.h>
+#include <asm/semaphore.h>
#include <linux/dvb/dmx.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index bce746b5e..b5edf3af2 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -21,7 +21,6 @@
*
*/
-#include <asm/uaccess.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -29,6 +28,7 @@
#include <linux/poll.h>
#include <linux/string.h>
#include <linux/crc32.h>
+#include <asm/uaccess.h>
#include "dvb_demux.h"
#include "dvb_functions.h"
@@ -75,22 +75,19 @@ struct list_head *dmx_get_demuxes(void)
******************************************************************************/
-static inline
-u16 section_length(const u8 *buf)
+static inline u16 section_length(const u8 *buf)
{
return 3+((buf[1]&0x0f)<<8)+buf[2];
}
-static inline
-u16 ts_pid(const u8 *buf)
+static inline u16 ts_pid(const u8 *buf)
{
return ((buf[1]&0x1f)<<8)+buf[2];
}
-static inline
-int payload(const u8 *tsp)
+static inline int payload(const u8 *tsp)
{
if (!(tsp[3] & 0x10)) // no payload?
return 0;
@@ -119,15 +116,13 @@ void dvb_set_crc32(u8 *data, int length)
}
-static
-u32 dvb_dmx_crc32 (struct dvb_demux_feed *f, const u8 *src, size_t len)
+static u32 dvb_dmx_crc32 (struct dvb_demux_feed *f, const u8 *src, size_t len)
{
return (f->feed.sec.crc_val = crc32_le (f->feed.sec.crc_val, src, len));
}
-static
-void dvb_dmx_memcopy (struct dvb_demux_feed *f, u8 *d, const u8 *s, size_t len)
+static void dvb_dmx_memcopy (struct dvb_demux_feed *f, u8 *d, const u8 *s, size_t len)
{
memcpy (d, s, len);
}
@@ -137,8 +132,7 @@ void dvb_dmx_memcopy (struct dvb_demux_feed *f, u8 *d, const u8 *s, size_t len)
* Software filter functions
******************************************************************************/
-static inline
-int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u8 *buf)
+static inline int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u8 *buf)
{
int count = payload(buf);
int p;
@@ -167,8 +161,7 @@ int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u8 *buf)
}
-static
-int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed,
+static int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed,
struct dvb_demux_filter *f)
{
u8 neq = 0;
@@ -191,8 +184,7 @@ int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed,
}
-static inline
-int dvb_dmx_swfilter_section_feed (struct dvb_demux_feed *feed)
+static inline int dvb_dmx_swfilter_section_feed (struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct dvb_demux_filter *f = feed->filter;
@@ -224,8 +216,7 @@ int dvb_dmx_swfilter_section_feed (struct dvb_demux_feed *feed)
}
-static
-int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf)
+static int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf)
{
struct dvb_demux *demux = feed->demux;
struct dmx_section_feed *sec = &feed->feed.sec;
@@ -351,8 +342,7 @@ int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf)
}
-static inline
-void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed, const u8 *buf)
+static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed, const u8 *buf)
{
switch(feed->type) {
case DMX_TYPE_TS:
@@ -444,8 +434,7 @@ void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count)
}
-static
-struct dvb_demux_filter* dvb_dmx_filter_alloc(struct dvb_demux *demux)
+static struct dvb_demux_filter * dvb_dmx_filter_alloc(struct dvb_demux *demux)
{
int i;
@@ -461,8 +450,7 @@ struct dvb_demux_filter* dvb_dmx_filter_alloc(struct dvb_demux *demux)
return &demux->filter[i];
}
-static
-struct dvb_demux_feed* dvb_dmx_feed_alloc(struct dvb_demux *demux)
+static struct dvb_demux_feed * dvb_dmx_feed_alloc(struct dvb_demux *demux)
{
int i;
@@ -479,8 +467,7 @@ struct dvb_demux_feed* dvb_dmx_feed_alloc(struct dvb_demux *demux)
}
-static
-int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
+static int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct list_head *pos, *n, *head=&demux->feed_list;
@@ -507,8 +494,7 @@ int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
}
-static
-int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
+static int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
enum dmx_ts_pes pes_type, size_t callback_length,
size_t circular_buffer_size, int descramble,
struct timespec timeout)
@@ -583,8 +569,7 @@ int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
}
-static
-int dmx_ts_feed_start_filtering(struct dmx_ts_feed* ts_feed)
+static int dmx_ts_feed_start_filtering(struct dmx_ts_feed* ts_feed)
{
struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
struct dvb_demux *demux = feed->demux;
@@ -617,8 +602,7 @@ int dmx_ts_feed_start_filtering(struct dmx_ts_feed* ts_feed)
return 0;
}
-static
-int dmx_ts_feed_stop_filtering(struct dmx_ts_feed* ts_feed)
+static int dmx_ts_feed_stop_filtering(struct dmx_ts_feed* ts_feed)
{
struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
struct dvb_demux *demux = feed->demux;
@@ -648,8 +632,7 @@ int dmx_ts_feed_stop_filtering(struct dmx_ts_feed* ts_feed)
return ret;
}
-static
-int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **ts_feed,
+static int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **ts_feed,
dmx_ts_cb callback)
{
struct dvb_demux *demux = (struct dvb_demux *) dmx;
@@ -694,8 +677,7 @@ int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **ts_feed
return 0;
}
-static
-int dvbdmx_release_ts_feed(struct dmx_demux *dmx, struct dmx_ts_feed *ts_feed)
+static int dvbdmx_release_ts_feed(struct dmx_demux *dmx, struct dmx_ts_feed *ts_feed)
{
struct dvb_demux *demux = (struct dvb_demux *) dmx;
struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
@@ -740,8 +722,7 @@ int dvbdmx_release_ts_feed(struct dmx_demux *dmx, struct dmx_ts_feed *ts_feed)
* dmx_section_feed API calls
******************************************************************************/
-static int
-dmx_section_feed_allocate_filter(struct dmx_section_feed* feed,
+static int dmx_section_feed_allocate_filter(struct dmx_section_feed* feed,
struct dmx_section_filter** filter)
{
struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
@@ -773,8 +754,7 @@ dmx_section_feed_allocate_filter(struct dmx_section_feed* feed,
}
-static int
-dmx_section_feed_set(struct dmx_section_feed* feed,
+static int dmx_section_feed_set(struct dmx_section_feed* feed,
u16 pid, size_t circular_buffer_size,
int descramble, int check_crc)
{
@@ -848,8 +828,7 @@ static void prepare_secfilters(struct dvb_demux_feed *dvbdmxfeed)
}
-static int
-dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
+static int dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
{
struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
@@ -893,8 +872,7 @@ dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
}
-static int
-dmx_section_feed_stop_filtering(struct dmx_section_feed* feed)
+static int dmx_section_feed_stop_filtering(struct dmx_section_feed* feed)
{
struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
@@ -920,8 +898,7 @@ dmx_section_feed_stop_filtering(struct dmx_section_feed* feed)
}
-static int
-dmx_section_feed_release_filter(struct dmx_section_feed *feed,
+static int dmx_section_feed_release_filter(struct dmx_section_feed *feed,
struct dmx_section_filter* filter)
{
struct dvb_demux_filter *dvbdmxfilter = (struct dvb_demux_filter *) filter, *f;
@@ -1088,8 +1065,7 @@ static int dvbdmx_add_frontend(struct dmx_demux *demux, struct dmx_frontend *fro
}
-static int
-dvbdmx_remove_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
+static int dvbdmx_remove_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
{
struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
struct list_head *pos, *n, *head = &dvbdemux->frontend_list;
@@ -1105,8 +1081,7 @@ dvbdmx_remove_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
}
-static struct list_head*
-dvbdmx_get_frontends(struct dmx_demux *demux)
+static struct list_head * dvbdmx_get_frontends(struct dmx_demux *demux)
{
struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
@@ -1156,8 +1131,7 @@ static int dvbdmx_get_pes_pids(struct dmx_demux *demux, u16 *pids)
}
-int
-dvb_dmx_init(struct dvb_demux *dvbdemux)
+int dvb_dmx_init(struct dvb_demux *dvbdemux)
{
int i, err;
struct dmx_demux *dmx = &dvbdemux->dmx;
@@ -1234,8 +1208,7 @@ dvb_dmx_init(struct dvb_demux *dvbdemux)
}
-int
-dvb_dmx_release(struct dvb_demux *dvbdemux)
+int dvb_dmx_release(struct dvb_demux *dvbdemux)
{
struct dmx_demux *dmx = &dvbdemux->dmx;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.h b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
index 135af1031..82add6530 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
@@ -25,10 +25,10 @@
#ifndef _DVB_DEMUX_H_
#define _DVB_DEMUX_H_
-#include <asm/semaphore.h>
#include <linux/time.h>
#include <linux/timer.h>
#include <linux/spinlock.h>
+#include <asm/semaphore.h>
#include "demux.h"
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
index 718ea900b..a9e81251a 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -26,8 +26,7 @@ u32 ac3_frames[3][32] =
#if 0
-static
-void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
+static void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
void (*pes_write)(u8 *buf, int count, void *data),
void *priv)
{
@@ -41,8 +40,7 @@ void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
#endif
#if 0
-static
-void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
+static void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
{
u8 off = 0;
@@ -68,8 +66,7 @@ void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
#if 0
/* needs 5 byte input, returns picture coding type*/
-static
-int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
+static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
{
u8 pct;
@@ -115,8 +112,7 @@ int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
#if 0
/* needs 4 byte input */
-static
-int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
+static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
{
if (pr) printk("GOP header: ");
@@ -147,8 +143,7 @@ int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
#if 0
/* needs 8 byte input */
-static
-int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
+static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
{
int sw;
int form = -1;
@@ -262,8 +257,7 @@ int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
#if 0
-static
-int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
+static int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
{
u8 *headr;
int found = 0;
@@ -292,8 +286,7 @@ int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
#if 0
-static
-int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
+static int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
{
u8 *headr;
int found = 0;
@@ -399,8 +392,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p
#if 0
-static
-u8 *skip_pes_header(u8 **bufp)
+static u8 *skip_pes_header(u8 **bufp)
{
u8 *inbuf = *bufp;
u8 *buf = inbuf;
@@ -438,8 +430,7 @@ u8 *skip_pes_header(u8 **bufp)
#endif
#if 0
-static
-void initialize_quant_matrix( u32 *matrix )
+static void initialize_quant_matrix( u32 *matrix )
{
int i;
@@ -466,8 +457,7 @@ void initialize_quant_matrix( u32 *matrix )
#endif
#if 0
-static
-void initialize_mpg_picture(struct mpg_picture *pic)
+static void initialize_mpg_picture(struct mpg_picture *pic)
{
int i;
@@ -494,8 +484,7 @@ void initialize_mpg_picture(struct mpg_picture *pic)
#endif
#if 0
-static
-void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
+static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
{
int16_t last_h_offset;
int16_t last_v_offset;
@@ -533,8 +522,7 @@ void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
#endif
#if 0
-static
-void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
+static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
{
pic->picture_header = 0;
pic->sequence_header_data
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 2f7594734..7e1f4ce1c 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -22,8 +22,6 @@
* Or, point your browser to http://www.gnu.org/copyleft/gpl.html
*/
-#include <asm/processor.h>
-#include <asm/semaphore.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@@ -32,6 +30,8 @@
#include <linux/poll.h>
#include <linux/module.h>
#include <linux/list.h>
+#include <asm/processor.h>
+#include <asm/semaphore.h>
#include "dvb_frontend.h"
#include "dvbdev.h"
@@ -102,8 +102,7 @@ static LIST_HEAD(frontend_notifier_list);
static DECLARE_MUTEX(frontend_mutex);
-static
-int dvb_frontend_internal_ioctl (struct dvb_frontend *frontend,
+static int dvb_frontend_internal_ioctl (struct dvb_frontend *frontend,
unsigned int cmd, void *arg)
{
int err = -EOPNOTSUPP;
@@ -131,8 +130,7 @@ int dvb_frontend_internal_ioctl (struct dvb_frontend *frontend,
* should make it still possible to receive the requested transponder
* on both tuners...
*/
-static
-void dvb_bend_frequency (struct dvb_frontend_data *this_fe, int recursive)
+static void dvb_bend_frequency (struct dvb_frontend_data *this_fe, int recursive)
{
struct list_head *entry;
int stepsize = this_fe->info->frequency_stepsize;
@@ -185,8 +183,7 @@ done:
}
-static
-void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe,
+static void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe,
fe_status_t s)
{
dprintk ("%s\n", __FUNCTION__);
@@ -210,8 +207,7 @@ void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe,
}
-static
-void dvb_frontend_add_event (struct dvb_frontend_data *fe, fe_status_t status)
+static void dvb_frontend_add_event (struct dvb_frontend_data *fe, fe_status_t status)
{
struct dvb_fe_events *events = &fe->events;
struct dvb_frontend_event *e;
@@ -249,8 +245,7 @@ void dvb_frontend_add_event (struct dvb_frontend_data *fe, fe_status_t status)
}
-static
-int dvb_frontend_get_event (struct dvb_frontend_data *fe,
+static int dvb_frontend_get_event (struct dvb_frontend_data *fe,
struct dvb_frontend_event *event, int flags)
{
struct dvb_fe_events *events = &fe->events;
@@ -294,8 +289,7 @@ int dvb_frontend_get_event (struct dvb_frontend_data *fe,
}
-static
-int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
+static int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
struct dvb_frontend_parameters *param,
int first_trial)
{
@@ -327,8 +321,7 @@ int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
return err;
}
-static
-void dvb_frontend_init (struct dvb_frontend_data *fe)
+static void dvb_frontend_init (struct dvb_frontend_data *fe)
{
struct dvb_frontend *frontend = &fe->frontend;
@@ -340,8 +333,7 @@ void dvb_frontend_init (struct dvb_frontend_data *fe)
}
-static
-void update_delay (int *quality, int *delay, int locked)
+static void update_delay (int *quality, int *delay, int locked)
{
int q2;
@@ -366,8 +358,7 @@ void update_delay (int *quality, int *delay, int locked)
* here we only come when we have lost the lock bit,
* let's try to do something useful...
*/
-static
-void dvb_frontend_recover (struct dvb_frontend_data *fe)
+static void dvb_frontend_recover (struct dvb_frontend_data *fe)
{
dprintk ("%s\n", __FUNCTION__);
@@ -415,8 +406,7 @@ void dvb_frontend_recover (struct dvb_frontend_data *fe)
-static
-int dvb_frontend_is_exiting (struct dvb_frontend_data *fe)
+static int dvb_frontend_is_exiting (struct dvb_frontend_data *fe)
{
if (fe->exit)
return 1;
@@ -429,8 +419,7 @@ int dvb_frontend_is_exiting (struct dvb_frontend_data *fe)
}
-static
-int dvb_frontend_thread (void *data)
+static int dvb_frontend_thread (void *data)
{
struct dvb_frontend_data *fe = (struct dvb_frontend_data *) data;
char name [15];
@@ -508,8 +497,7 @@ int dvb_frontend_thread (void *data)
}
-static
-void dvb_frontend_stop (struct dvb_frontend_data *fe)
+static void dvb_frontend_stop (struct dvb_frontend_data *fe)
{
dprintk ("%s\n", __FUNCTION__);
@@ -538,8 +526,7 @@ void dvb_frontend_stop (struct dvb_frontend_data *fe)
}
-static
-int dvb_frontend_start (struct dvb_frontend_data *fe)
+static int dvb_frontend_start (struct dvb_frontend_data *fe)
{
int ret, pt;
@@ -587,8 +574,7 @@ int dvb_frontend_start (struct dvb_frontend_data *fe)
}
-static
-int dvb_frontend_ioctl (struct inode *inode, struct file *file,
+static int dvb_frontend_ioctl (struct inode *inode, struct file *file,
unsigned int cmd, void *parg)
{
struct dvb_device *dvbdev = file->private_data;
@@ -631,8 +617,7 @@ int dvb_frontend_ioctl (struct inode *inode, struct file *file,
}
-static
-unsigned int dvb_frontend_poll (struct file *file, struct poll_table_struct *wait)
+static unsigned int dvb_frontend_poll (struct file *file, struct poll_table_struct *wait)
{
struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend_data *fe = dvbdev->priv;
@@ -648,8 +633,7 @@ unsigned int dvb_frontend_poll (struct file *file, struct poll_table_struct *wai
}
-static
-int dvb_frontend_open (struct inode *inode, struct file *file)
+static int dvb_frontend_open (struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend_data *fe = dvbdev->priv;
@@ -673,8 +657,7 @@ int dvb_frontend_open (struct inode *inode, struct file *file)
}
-static
-int dvb_frontend_release (struct inode *inode, struct file *file)
+static int dvb_frontend_release (struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend_data *fe = dvbdev->priv;
@@ -875,8 +858,7 @@ dvb_remove_frontend_notifier (struct dvb_adapter *adapter,
}
-static
-struct file_operations dvb_frontend_fops = {
+static struct file_operations dvb_frontend_fops = {
.owner = THIS_MODULE,
.ioctl = dvb_generic_ioctl,
.poll = dvb_frontend_poll,
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
index 789ef57db..76fe52178 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -25,7 +25,7 @@
#ifndef _DVB_FRONTEND_H_
#define _DVB_FRONTEND_H_
-#include <asm/types.h>
+#include <linux/types.h>
#include <linux/sched.h>
#include <linux/ioctl.h>
#include <linux/i2c.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
index 2d6e5c20d..0159d8d1c 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
@@ -19,11 +19,11 @@
* Or, point your browser to http://www.gnu.org/copyleft/gpl.html
*/
-#include <asm/semaphore.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/module.h>
+#include <asm/semaphore.h>
#include "dvb_i2c.h"
#include "dvb_functions.h"
@@ -41,8 +41,7 @@ LIST_HEAD(dvb_i2c_devicelist);
DECLARE_MUTEX(dvb_i2c_mutex);
-static
-int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
+static int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
{
struct dvb_i2c_device *client;
@@ -60,8 +59,7 @@ int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
}
-static
-void try_attach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
+static void try_attach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
{
if (dev->owner) {
if (!try_module_get(dev->owner))
@@ -77,8 +75,7 @@ void try_attach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
}
-static
-void detach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
+static void detach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
{
dev->detach (i2c);
@@ -87,8 +84,7 @@ void detach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
}
-static
-void unregister_i2c_client_from_bus (struct dvb_i2c_device *dev,
+static void unregister_i2c_client_from_bus (struct dvb_i2c_device *dev,
struct dvb_i2c_bus *i2c)
{
struct list_head *entry, *n;
@@ -106,8 +102,7 @@ void unregister_i2c_client_from_bus (struct dvb_i2c_device *dev,
}
-static
-void unregister_i2c_client_from_all_busses (struct dvb_i2c_device *dev)
+static void unregister_i2c_client_from_all_busses (struct dvb_i2c_device *dev)
{
struct list_head *entry, *n;
@@ -121,8 +116,7 @@ void unregister_i2c_client_from_all_busses (struct dvb_i2c_device *dev)
}
-static
-void unregister_all_clients_from_bus (struct dvb_i2c_bus *i2c)
+static void unregister_all_clients_from_bus (struct dvb_i2c_bus *i2c)
{
struct list_head *entry, *n;
@@ -136,8 +130,7 @@ void unregister_all_clients_from_bus (struct dvb_i2c_bus *i2c)
}
-static
-void probe_device_on_all_busses (struct dvb_i2c_device *dev)
+static void probe_device_on_all_busses (struct dvb_i2c_device *dev)
{
struct list_head *entry;
@@ -151,8 +144,7 @@ void probe_device_on_all_busses (struct dvb_i2c_device *dev)
}
-static
-void probe_devices_on_bus (struct dvb_i2c_bus *i2c)
+static void probe_devices_on_bus (struct dvb_i2c_bus *i2c)
{
struct list_head *entry;
@@ -166,8 +158,7 @@ void probe_devices_on_bus (struct dvb_i2c_bus *i2c)
}
-static
-struct dvb_i2c_bus* dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
+static struct dvb_i2c_bus* dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
const struct i2c_msg msgs[],
int num),
struct dvb_adapter *adapter,
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
index 32a615a76..ccc0de7cd 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
@@ -1,9 +1,9 @@
-#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/ioctl.h>
#include <linux/slab.h>
#include <linux/fs.h>
+#include <asm/uaccess.h>
#include "dmxdev.h"
#include "dvb_demux.h"
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index d9472a030..9717da34d 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -24,9 +24,9 @@
*
*/
+#include <linux/dvb/net.h>
#include <asm/uaccess.h>
-#include <linux/dvb/net.h>
#include "dvb_demux.h"
#include "dvb_net.h"
#include "dvb_functions.h"
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index fb5248c98..86674212a 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@ -32,12 +32,12 @@
#define __KERNEL_SYSCALLS__
-#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/string.h>
+#include <asm/uaccess.h>
#include "dvb_ringbuffer.h"
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 7b77d4862..1e9d07b8f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -21,8 +21,7 @@
*
*/
-#include <asm/types.h>
-#include <asm/semaphore.h>
+#include <linux/types.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/module.h>
@@ -57,8 +56,7 @@ static char *dnames[] = {
#define DVB_MAX_IDS 4
#define nums2minor(num,type,id) ((num << 6) | (id << 4) | type)
-static
-struct dvb_device* dvbdev_find_device (int minor)
+static struct dvb_device* dvbdev_find_device (int minor)
{
struct list_head *entry;
@@ -78,8 +76,7 @@ struct dvb_device* dvbdev_find_device (int minor)
}
-static
-int dvb_device_open(struct inode *inode, struct file *file)
+static int dvb_device_open(struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev;
@@ -165,8 +162,7 @@ int dvb_generic_ioctl(struct inode *inode, struct file *file,
}
-static
-int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
+static int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
{
u32 id = 0;
@@ -263,8 +259,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
}
-static
-int dvbdev_get_free_adapter_num (void)
+static int dvbdev_get_free_adapter_num (void)
{
int num = 0;
@@ -344,8 +339,7 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
}
-static
-int __init init_dvbdev(void)
+static int __init init_dvbdev(void)
{
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
dvb_devfs_handle = devfs_mk_dir (NULL, "dvb", NULL);
@@ -362,8 +356,7 @@ int __init init_dvbdev(void)
}
-static
-void __exit exit_dvbdev(void)
+static void __exit exit_dvbdev(void)
{
#ifndef CONFIG_DVB_DEVFS_ONLY
unregister_chrdev(DVB_MAJOR, "DVB");
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h
index b9eac9b46..2c14d0e1f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h
@@ -24,7 +24,7 @@
#ifndef _DVBDEV_H_
#define _DVBDEV_H_
-#include <asm/types.h>
+#include <linux/types.h>
#include <linux/poll.h>
#include <linux/fs.h>
#include <linux/list.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 08:45:29 +0000