Skip to content

L
linux
Commit 0c53c70f authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Linus Torvalds
Browse files
Options

[PATCH] dvb: remove unnecessary casts in dvb-core 

remove unnecessary casts in dvb-core (Kenneth Aafloy)
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2d4f2c2e
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 72 deletions
drivers/media/dvb/dvb-core/dmxdev.c
View file @ 0c53c70f
...@@ -175,8 +175,8 @@ static inline void dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int st ...@@ -175,8 +175,8 @@ static inline void dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int st
static int dvb_dvr_open(struct inode *inode, struct file *file) static int dvb_dvr_open(struct inode *inode, struct file *file)
{ {
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv; struct dmxdev *dmxdev = dvbdev->priv;
struct dmx_frontend *front; struct dmx_frontend *front;
dprintk ("function : %s\n", __FUNCTION__); dprintk ("function : %s\n", __FUNCTION__);
...@@ -224,8 +224,8 @@ static int dvb_dvr_open(struct inode *inode, struct file *file) ...@@ -224,8 +224,8 @@ static int dvb_dvr_open(struct inode *inode, struct file *file)
static int dvb_dvr_release(struct inode *inode, struct file *file) static int dvb_dvr_release(struct inode *inode, struct file *file)
{ {
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv; struct dmxdev *dmxdev = dvbdev->priv;
if (down_interruptible (&dmxdev->mutex)) if (down_interruptible (&dmxdev->mutex))
return -ERESTARTSYS; return -ERESTARTSYS;
...@@ -252,8 +252,8 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) ...@@ -252,8 +252,8 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
static ssize_t dvb_dvr_write(struct file *file, const char __user *buf, static ssize_t dvb_dvr_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv; struct dmxdev *dmxdev = dvbdev->priv;
int ret; int ret;
if (!dmxdev->demux->write) if (!dmxdev->demux->write)
...@@ -270,8 +270,8 @@ static ssize_t dvb_dvr_write(struct file *file, const char __user *buf, ...@@ -270,8 +270,8 @@ static ssize_t dvb_dvr_write(struct file *file, const char __user *buf,
static ssize_t dvb_dvr_read(struct file *file, char __user *buf, size_t count, static ssize_t dvb_dvr_read(struct file *file, char __user *buf, size_t count,
loff_t *ppos) loff_t *ppos)
{ {
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv; struct dmxdev *dmxdev = dvbdev->priv;
int ret; int ret;
//down(&dmxdev->mutex); //down(&dmxdev->mutex);
...@@ -345,7 +345,7 @@ static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len, ...@@ -345,7 +345,7 @@ static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len, const u8 *buffer2, size_t buffer2_len,
struct dmx_section_filter *filter, enum dmx_success success) struct dmx_section_filter *filter, enum dmx_success success)
{ {
struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) filter->priv; struct dmxdev_filter *dmxdevfilter = filter->priv;
int ret; int ret;
if (dmxdevfilter->buffer.error) { if (dmxdevfilter->buffer.error) {
...@@ -381,7 +381,7 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len, ...@@ -381,7 +381,7 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len, const u8 *buffer2, size_t buffer2_len,
struct dmx_ts_feed *feed, enum dmx_success success) struct dmx_ts_feed *feed, enum dmx_success success)
{ {
struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) feed->priv; struct dmxdev_filter *dmxdevfilter = feed->priv;
struct dmxdev_buffer *buffer; struct dmxdev_buffer *buffer;
int ret; int ret;
...@@ -684,8 +684,8 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter) ...@@ -684,8 +684,8 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
static int dvb_demux_open(struct inode *inode, struct file *file) static int dvb_demux_open(struct inode *inode, struct file *file)
{ {
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv; struct dmxdev *dmxdev = dvbdev->priv;
int i; int i;
struct dmxdev_filter *dmxdevfilter; struct dmxdev_filter *dmxdevfilter;
...@@ -1013,8 +1013,8 @@ static struct dvb_device dvbdev_demux = { ...@@ -1013,8 +1013,8 @@ static struct dvb_device dvbdev_demux = {
static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file, static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg) unsigned int cmd, void *parg)
{ {
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv; struct dmxdev *dmxdev = dvbdev->priv;
int ret=0; int ret=0;
...@@ -1044,8 +1044,8 @@ static int dvb_dvr_ioctl(struct inode *inode, struct file *file, ...@@ -1044,8 +1044,8 @@ 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 dvb_device *dvbdev = file->private_data;
struct dmxdev *dmxdev = (struct dmxdev *) dvbdev->priv; struct dmxdev *dmxdev = dvbdev->priv;
unsigned int mask = 0; unsigned int mask = 0;
dprintk ("function : %s\n", __FUNCTION__); dprintk ("function : %s\n", __FUNCTION__);
......
drivers/media/dvb/dvb-core/dvb_ca_en50221.c
View file @ 0c53c70f
...@@ -829,7 +829,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_camready_irq); ...@@ -829,7 +829,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_camready_irq);
*/ */
void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221 *pubca, int slot, int change_type) void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221 *pubca, int slot, int change_type)
{ {
struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private; struct dvb_ca_private *ca = pubca->private;
dprintk("CAMCHANGE IRQ slot:%i change_type:%i\n", slot, change_type); dprintk("CAMCHANGE IRQ slot:%i change_type:%i\n", slot, change_type);
...@@ -857,7 +857,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_frda_irq); ...@@ -857,7 +857,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_frda_irq);
*/ */
void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot) void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot)
{ {
struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private; struct dvb_ca_private *ca = pubca->private;
dprintk("CAMREADY IRQ slot:%i\n", slot); dprintk("CAMREADY IRQ slot:%i\n", slot);
...@@ -876,7 +876,7 @@ void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot) ...@@ -876,7 +876,7 @@ void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot)
*/ */
void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *pubca, int slot) void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *pubca, int slot)
{ {
struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private; struct dvb_ca_private *ca = pubca->private;
int flags; int flags;
dprintk("FR/DA IRQ slot:%i\n", slot); dprintk("FR/DA IRQ slot:%i\n", slot);
...@@ -993,7 +993,7 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca) ...@@ -993,7 +993,7 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca)
*/ */
static int dvb_ca_en50221_thread(void *data) static int dvb_ca_en50221_thread(void *data)
{ {
struct dvb_ca_private *ca = (struct dvb_ca_private *) data; struct dvb_ca_private *ca = data;
char name[15]; char name[15];
int slot; int slot;
int flags; int flags;
...@@ -1202,8 +1202,8 @@ static int dvb_ca_en50221_thread(void *data) ...@@ -1202,8 +1202,8 @@ static int dvb_ca_en50221_thread(void *data)
static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file, static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg) unsigned int cmd, void *parg)
{ {
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv; struct dvb_ca_private *ca = dvbdev->priv;
int err = 0; int err = 0;
int slot; int slot;
...@@ -1225,7 +1225,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file, ...@@ -1225,7 +1225,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
break; break;
case CA_GET_CAP: { case CA_GET_CAP: {
struct ca_caps *caps = (struct ca_caps *) parg; struct ca_caps *caps = parg;
caps->slot_num = ca->slot_count; caps->slot_num = ca->slot_count;
caps->slot_type = CA_CI_LINK; caps->slot_type = CA_CI_LINK;
...@@ -1235,7 +1235,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file, ...@@ -1235,7 +1235,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
} }
case CA_GET_SLOT_INFO: { case CA_GET_SLOT_INFO: {
struct ca_slot_info *info = (struct ca_slot_info *) parg; struct ca_slot_info *info = parg;
if ((info->num > ca->slot_count) || (info->num < 0)) if ((info->num > ca->slot_count) || (info->num < 0))
return -EINVAL; return -EINVAL;
...@@ -1291,8 +1291,8 @@ static int dvb_ca_en50221_io_ioctl(struct inode *inode, struct file *file, ...@@ -1291,8 +1291,8 @@ static int dvb_ca_en50221_io_ioctl(struct inode *inode, struct file *file,
static ssize_t dvb_ca_en50221_io_write(struct file *file, static ssize_t dvb_ca_en50221_io_write(struct file *file,
const char __user * buf, size_t count, loff_t * ppos) const char __user * buf, size_t count, loff_t * ppos)
{ {
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv; struct dvb_ca_private *ca = dvbdev->priv;
u8 slot, connection_id; u8 slot, connection_id;
int status; int status;
char fragbuf[HOST_LINK_BUF_SIZE]; char fragbuf[HOST_LINK_BUF_SIZE];
...@@ -1428,8 +1428,8 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *resu ...@@ -1428,8 +1428,8 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *resu
static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf, static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
size_t count, loff_t * ppos) size_t count, loff_t * ppos)
{ {
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv; struct dvb_ca_private *ca = dvbdev->priv;
int status; int status;
int result = 0; int result = 0;
u8 hdr[2]; u8 hdr[2];
...@@ -1526,8 +1526,8 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf, ...@@ -1526,8 +1526,8 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
*/ */
static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file) static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file)
{ {
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv; struct dvb_ca_private *ca = dvbdev->priv;
int err; int err;
int i; int i;
...@@ -1569,8 +1569,8 @@ static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file) ...@@ -1569,8 +1569,8 @@ static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file)
*/ */
static int dvb_ca_en50221_io_release(struct inode *inode, struct file *file) static int dvb_ca_en50221_io_release(struct inode *inode, struct file *file)
{ {
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv; struct dvb_ca_private *ca = dvbdev->priv;
int err = 0; int err = 0;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __FUNCTION__);
...@@ -1597,8 +1597,8 @@ static int dvb_ca_en50221_io_release(struct inode *inode, struct file *file) ...@@ -1597,8 +1597,8 @@ static int dvb_ca_en50221_io_release(struct inode *inode, struct file *file)
*/ */
static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait) static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait)
{ {
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv; struct dvb_ca_private *ca = dvbdev->priv;
unsigned int mask = 0; unsigned int mask = 0;
int slot; int slot;
int result = 0; int result = 0;
...@@ -1750,7 +1750,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_release); ...@@ -1750,7 +1750,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_release);
*/ */
void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca) void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca)
{ {
struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private; struct dvb_ca_private *ca = pubca->private;
int i; int i;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __FUNCTION__);
......
drivers/media/dvb/dvb-core/dvb_frontend.c
View file @ 0c53c70f
...@@ -117,7 +117,7 @@ struct dvb_frontend_private { ...@@ -117,7 +117,7 @@ struct dvb_frontend_private {
static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status) static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
{ {
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
struct dvb_fe_events *events = &fepriv->events; struct dvb_fe_events *events = &fepriv->events;
struct dvb_frontend_event *e; struct dvb_frontend_event *e;
int wp; int wp;
...@@ -155,7 +155,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status) ...@@ -155,7 +155,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
static int dvb_frontend_get_event(struct dvb_frontend *fe, static int dvb_frontend_get_event(struct dvb_frontend *fe,
struct dvb_frontend_event *event, int flags) struct dvb_frontend_event *event, int flags)
{ {
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
struct dvb_fe_events *events = &fepriv->events; struct dvb_fe_events *events = &fepriv->events;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
...@@ -234,7 +234,7 @@ static int dvb_frontend_autotune(struct dvb_frontend *fe, int check_wrapped) ...@@ -234,7 +234,7 @@ static int dvb_frontend_autotune(struct dvb_frontend *fe, int check_wrapped)
{ {
int autoinversion; int autoinversion;
int ready = 0; int ready = 0;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
int original_inversion = fepriv->parameters.inversion; int original_inversion = fepriv->parameters.inversion;
u32 original_frequency = fepriv->parameters.frequency; u32 original_frequency = fepriv->parameters.frequency;
...@@ -321,7 +321,7 @@ static int dvb_frontend_autotune(struct dvb_frontend *fe, int check_wrapped) ...@@ -321,7 +321,7 @@ static int dvb_frontend_autotune(struct dvb_frontend *fe, int check_wrapped)
static int dvb_frontend_is_exiting(struct dvb_frontend *fe) static int dvb_frontend_is_exiting(struct dvb_frontend *fe)
{ {
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
if (fepriv->exit) if (fepriv->exit)
return 1; return 1;
...@@ -335,7 +335,7 @@ static int dvb_frontend_is_exiting(struct dvb_frontend *fe) ...@@ -335,7 +335,7 @@ static int dvb_frontend_is_exiting(struct dvb_frontend *fe)
static int dvb_frontend_should_wakeup(struct dvb_frontend *fe) static int dvb_frontend_should_wakeup(struct dvb_frontend *fe)
{ {
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
if (fepriv->wakeup) { if (fepriv->wakeup) {
fepriv->wakeup = 0; fepriv->wakeup = 0;
...@@ -346,7 +346,7 @@ static int dvb_frontend_should_wakeup(struct dvb_frontend *fe) ...@@ -346,7 +346,7 @@ static int dvb_frontend_should_wakeup(struct dvb_frontend *fe)
static void dvb_frontend_wakeup(struct dvb_frontend *fe) static void dvb_frontend_wakeup(struct dvb_frontend *fe)
{ {
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
fepriv->wakeup = 1; fepriv->wakeup = 1;
wake_up_interruptible(&fepriv->wait_queue); wake_up_interruptible(&fepriv->wait_queue);
...@@ -357,8 +357,8 @@ static void dvb_frontend_wakeup(struct dvb_frontend *fe) ...@@ -357,8 +357,8 @@ static void dvb_frontend_wakeup(struct dvb_frontend *fe)
*/ */
static int dvb_frontend_thread(void *data) static int dvb_frontend_thread(void *data)
{ {
struct dvb_frontend *fe = (struct dvb_frontend *) data; struct dvb_frontend *fe = data;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
unsigned long timeout; unsigned long timeout;
char name [15]; char name [15];
int quality = 0, delay = 3*HZ; int quality = 0, delay = 3*HZ;
...@@ -520,7 +520,7 @@ static int dvb_frontend_thread(void *data) ...@@ -520,7 +520,7 @@ static int dvb_frontend_thread(void *data)
static void dvb_frontend_stop(struct dvb_frontend *fe) static void dvb_frontend_stop(struct dvb_frontend *fe)
{ {
unsigned long ret; unsigned long ret;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
...@@ -559,7 +559,7 @@ static void dvb_frontend_stop(struct dvb_frontend *fe) ...@@ -559,7 +559,7 @@ static void dvb_frontend_stop(struct dvb_frontend *fe)
static int dvb_frontend_start(struct dvb_frontend *fe) static int dvb_frontend_start(struct dvb_frontend *fe)
{ {
int ret; int ret;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
...@@ -597,7 +597,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, ...@@ -597,7 +597,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
{ {
struct dvb_device *dvbdev = file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend *fe = dvbdev->priv; struct dvb_frontend *fe = dvbdev->priv;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
int err = -EOPNOTSUPP; int err = -EOPNOTSUPP;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
...@@ -615,7 +615,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, ...@@ -615,7 +615,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
switch (cmd) { switch (cmd) {
case FE_GET_INFO: { case FE_GET_INFO: {
struct dvb_frontend_info* info = (struct dvb_frontend_info*) parg; struct dvb_frontend_info* info = parg;
memcpy(info, &fe->ops->info, sizeof(struct dvb_frontend_info)); memcpy(info, &fe->ops->info, sizeof(struct dvb_frontend_info));
/* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't /* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't
...@@ -793,7 +793,7 @@ static unsigned int dvb_frontend_poll(struct file *file, struct poll_table_struc ...@@ -793,7 +793,7 @@ static unsigned int dvb_frontend_poll(struct file *file, struct poll_table_struc
{ {
struct dvb_device *dvbdev = file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend *fe = dvbdev->priv; struct dvb_frontend *fe = dvbdev->priv;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
...@@ -809,7 +809,7 @@ static int dvb_frontend_open(struct inode *inode, struct file *file) ...@@ -809,7 +809,7 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)
{ {
struct dvb_device *dvbdev = file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend *fe = dvbdev->priv; struct dvb_frontend *fe = dvbdev->priv;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
int ret; int ret;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
...@@ -833,7 +833,7 @@ static int dvb_frontend_release(struct inode *inode, struct file *file) ...@@ -833,7 +833,7 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)
{ {
struct dvb_device *dvbdev = file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend *fe = dvbdev->priv; struct dvb_frontend *fe = dvbdev->priv;
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
...@@ -873,7 +873,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb, ...@@ -873,7 +873,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
up(&frontend_mutex); up(&frontend_mutex);
return -ENOMEM; return -ENOMEM;
} }
fepriv = (struct dvb_frontend_private*) fe->frontend_priv; fepriv = fe->frontend_priv;
memset(fe->frontend_priv, 0, sizeof(struct dvb_frontend_private)); memset(fe->frontend_priv, 0, sizeof(struct dvb_frontend_private));
init_MUTEX (&fepriv->sem); init_MUTEX (&fepriv->sem);
...@@ -897,7 +897,7 @@ EXPORT_SYMBOL(dvb_register_frontend); ...@@ -897,7 +897,7 @@ EXPORT_SYMBOL(dvb_register_frontend);
int dvb_unregister_frontend(struct dvb_frontend* fe) int dvb_unregister_frontend(struct dvb_frontend* fe)
{ {
struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv; struct dvb_frontend_private *fepriv = fe->frontend_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __FUNCTION__);
down (&frontend_mutex); down (&frontend_mutex);
......
drivers/media/dvb/dvb-core/dvb_net.c
View file @ 0c53c70f
...@@ -315,7 +315,7 @@ static inline void reset_ule( struct dvb_net_priv *p ) ...@@ -315,7 +315,7 @@ static inline void reset_ule( struct dvb_net_priv *p )
*/ */
static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len ) static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv *)dev->priv; struct dvb_net_priv *priv = dev->priv;
unsigned long skipped = 0L; unsigned long skipped = 0L;
u8 *ts, *ts_end, *from_where = NULL, ts_remain = 0, how_much = 0, new_ts = 1; u8 *ts, *ts_end, *from_where = NULL, ts_remain = 0, how_much = 0, new_ts = 1;
struct ethhdr *ethh = NULL; struct ethhdr *ethh = NULL;
...@@ -709,7 +709,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, ...@@ -709,7 +709,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len, const u8 *buffer2, size_t buffer2_len,
struct dmx_ts_feed *feed, enum dmx_success success) struct dmx_ts_feed *feed, enum dmx_success success)
{ {
struct net_device *dev = (struct net_device *)feed->priv; struct net_device *dev = feed->priv;
if (buffer2 != 0) if (buffer2 != 0)
printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2); printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2);
...@@ -801,7 +801,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len, ...@@ -801,7 +801,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
struct dmx_section_filter *filter, struct dmx_section_filter *filter,
enum dmx_success success) enum dmx_success success)
{ {
struct net_device *dev=(struct net_device *) filter->priv; struct net_device *dev = filter->priv;
/** /**
* we rely on the DVB API definition where exactly one complete * we rely on the DVB API definition where exactly one complete
...@@ -826,7 +826,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev, ...@@ -826,7 +826,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev,
struct dmx_section_filter **secfilter, struct dmx_section_filter **secfilter,
u8 *mac, u8 *mac_mask) u8 *mac, u8 *mac_mask)
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
int ret; int ret;
*secfilter=NULL; *secfilter=NULL;
...@@ -870,7 +870,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev, ...@@ -870,7 +870,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev,
static int dvb_net_feed_start(struct net_device *dev) static int dvb_net_feed_start(struct net_device *dev)
{ {
int ret, i; int ret, i;
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
struct dmx_demux *demux = priv->demux; struct dmx_demux *demux = priv->demux;
unsigned char *mac = (unsigned char *) dev->dev_addr; unsigned char *mac = (unsigned char *) dev->dev_addr;
...@@ -965,7 +965,7 @@ static int dvb_net_feed_start(struct net_device *dev) ...@@ -965,7 +965,7 @@ static int dvb_net_feed_start(struct net_device *dev)
static int dvb_net_feed_stop(struct net_device *dev) static int dvb_net_feed_stop(struct net_device *dev)
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
int i; int i;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __FUNCTION__);
...@@ -1016,7 +1016,7 @@ static int dvb_net_feed_stop(struct net_device *dev) ...@@ -1016,7 +1016,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc) static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc)
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
if (priv->multi_num == DVB_NET_MULTICAST_MAX) if (priv->multi_num == DVB_NET_MULTICAST_MAX)
return -ENOMEM; return -ENOMEM;
...@@ -1031,7 +1031,7 @@ static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc) ...@@ -1031,7 +1031,7 @@ static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc)
static void wq_set_multicast_list (void *data) static void wq_set_multicast_list (void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
dvb_net_feed_stop(dev); dvb_net_feed_stop(dev);
...@@ -1066,7 +1066,7 @@ static void wq_set_multicast_list (void *data) ...@@ -1066,7 +1066,7 @@ static void wq_set_multicast_list (void *data)
static void dvb_net_set_multicast_list (struct net_device *dev) static void dvb_net_set_multicast_list (struct net_device *dev)
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
schedule_work(&priv->set_multicast_list_wq); schedule_work(&priv->set_multicast_list_wq);
} }
...@@ -1084,7 +1084,7 @@ static void wq_restart_net_feed (void *data) ...@@ -1084,7 +1084,7 @@ static void wq_restart_net_feed (void *data)
static int dvb_net_set_mac (struct net_device *dev, void *p) static int dvb_net_set_mac (struct net_device *dev, void *p)
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
struct sockaddr *addr=p; struct sockaddr *addr=p;
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
...@@ -1098,7 +1098,7 @@ static int dvb_net_set_mac (struct net_device *dev, void *p) ...@@ -1098,7 +1098,7 @@ static int dvb_net_set_mac (struct net_device *dev, void *p)
static int dvb_net_open(struct net_device *dev) static int dvb_net_open(struct net_device *dev)
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
priv->in_use++; priv->in_use++;
dvb_net_feed_start(dev); dvb_net_feed_start(dev);
...@@ -1108,7 +1108,7 @@ static int dvb_net_open(struct net_device *dev) ...@@ -1108,7 +1108,7 @@ static int dvb_net_open(struct net_device *dev)
static int dvb_net_stop(struct net_device *dev) static int dvb_net_stop(struct net_device *dev)
{ {
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = dev->priv;
priv->in_use--; priv->in_use--;
return dvb_net_feed_stop(dev); return dvb_net_feed_stop(dev);
...@@ -1228,8 +1228,8 @@ static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num) ...@@ -1228,8 +1228,8 @@ static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num)
static int dvb_net_do_ioctl(struct inode *inode, struct file *file, static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg) unsigned int cmd, void *parg)
{ {
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = file->private_data;
struct dvb_net *dvbnet = (struct dvb_net *) dvbdev->priv; struct dvb_net *dvbnet = dvbdev->priv;
if (((file->f_flags&O_ACCMODE)==O_RDONLY)) if (((file->f_flags&O_ACCMODE)==O_RDONLY))
return -EPERM; return -EPERM;
...@@ -1237,7 +1237,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, ...@@ -1237,7 +1237,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
switch (cmd) { switch (cmd) {
case NET_ADD_IF: case NET_ADD_IF:
{ {
struct dvb_net_if *dvbnetif=(struct dvb_net_if *)parg; struct dvb_net_if *dvbnetif = parg;
int result; int result;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
...@@ -1258,7 +1258,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, ...@@ -1258,7 +1258,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
{ {
struct net_device *netdev; struct net_device *netdev;
struct dvb_net_priv *priv_data; struct dvb_net_priv *priv_data;
struct dvb_net_if *dvbnetif=(struct dvb_net_if *)parg; struct dvb_net_if *dvbnetif = parg;
if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX || if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX ||
!dvbnet->state[dvbnetif->if_num]) !dvbnet->state[dvbnetif->if_num])
...@@ -1266,7 +1266,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, ...@@ -1266,7 +1266,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
netdev = dvbnet->device[dvbnetif->if_num]; netdev = dvbnet->device[dvbnetif->if_num];
priv_data=(struct dvb_net_priv*)netdev->priv; priv_data = netdev->priv;
dvbnetif->pid=priv_data->pid; dvbnetif->pid=priv_data->pid;
dvbnetif->feedtype=priv_data->feedtype; dvbnetif->feedtype=priv_data->feedtype;
break; break;
...@@ -1288,7 +1288,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, ...@@ -1288,7 +1288,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
/* binary compatiblity cruft */ /* binary compatiblity cruft */
case __NET_ADD_IF_OLD: case __NET_ADD_IF_OLD:
{ {
struct __dvb_net_if_old *dvbnetif=(struct __dvb_net_if_old *)parg; struct __dvb_net_if_old *dvbnetif = parg;
int result; int result;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
...@@ -1309,7 +1309,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, ...@@ -1309,7 +1309,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
{ {
struct net_device *netdev; struct net_device *netdev;
struct dvb_net_priv *priv_data; struct dvb_net_priv *priv_data;
struct __dvb_net_if_old *dvbnetif=(struct __dvb_net_if_old *)parg; struct __dvb_net_if_old *dvbnetif = parg;
if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX || if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX ||
!dvbnet->state[dvbnetif->if_num]) !dvbnet->state[dvbnetif->if_num])
...@@ -1317,7 +1317,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, ...@@ -1317,7 +1317,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
netdev = dvbnet->device[dvbnetif->if_num]; netdev = dvbnet->device[dvbnetif->if_num];
priv_data=(struct dvb_net_priv*)netdev->priv; priv_data = netdev->priv;
dvbnetif->pid=priv_data->pid; dvbnetif->pid=priv_data->pid;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7