Remove unneeded casts of (void *) pointers. Signed-off-by: Domen Puncer --- c/drivers/media/dvb/dvb-core/dvb_net.c 2004-11-15 13:42:10.000000000 +0100 +++ a/drivers/media/dvb/dvb-core/dvb_net.c 2004-12-03 14:51:08.000000000 +0100 @@ -196,7 +196,7 @@ static const char eth_dest_addr[] = { 0x 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, skblen = 0L; u8 *ts, *ts_end, *from_where = NULL, ts_remain = 0, how_much = 0, new_ts = 1; struct ethhdr *ethh = NULL; @@ -557,7 +557,7 @@ static int dvb_net_ts_callback(const u8 const u8 *buffer2, size_t buffer2_len, 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) printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2); @@ -649,7 +649,7 @@ static int dvb_net_sec_callback(const u8 struct dmx_section_filter *filter, 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 @@ -673,7 +673,7 @@ static int dvb_net_filter_sec_set(struct struct dmx_section_filter **secfilter, 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; *secfilter=NULL; @@ -683,7 +683,7 @@ static int dvb_net_filter_sec_set(struct return ret; } - (*secfilter)->priv=(void *) dev; + (*secfilter)->priv = dev; memset((*secfilter)->filter_value, 0x00, DMX_MAX_FILTER_SIZE); memset((*secfilter)->filter_mask, 0x00, DMX_MAX_FILTER_SIZE); @@ -717,7 +717,7 @@ static int dvb_net_filter_sec_set(struct static int dvb_net_feed_start(struct net_device *dev) { 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; unsigned char *mac = (unsigned char *) dev->dev_addr; @@ -787,7 +787,7 @@ static int dvb_net_feed_start(struct net } /* Set netdevice pointer for ts decaps callback. */ - priv->tsfeed->priv = (void *)dev; + priv->tsfeed->priv = dev; ret = priv->tsfeed->set(priv->tsfeed, priv->pid, TS_PACKET, DMX_TS_PES_OTHER, 188 * 100, /* nr. of bytes delivered per callback */ @@ -812,7 +812,7 @@ static int dvb_net_feed_start(struct net 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; dprintk("%s\n", __FUNCTION__); @@ -863,7 +863,7 @@ static int dvb_net_feed_stop(struct net_ 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) return -ENOMEM; @@ -878,7 +878,7 @@ static int dvb_set_mc_filter (struct net static void wq_set_multicast_list (void *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); @@ -913,7 +913,7 @@ static void wq_set_multicast_list (void 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); } @@ -931,7 +931,7 @@ static void wq_restart_net_feed (void *d 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; memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); @@ -945,7 +945,7 @@ static int dvb_net_set_mac (struct net_d 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++; dvb_net_feed_start(dev); @@ -955,7 +955,7 @@ static int dvb_net_open(struct net_devic 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--; return dvb_net_feed_stop(dev); @@ -1071,8 +1071,8 @@ static int dvb_net_remove_if(struct dvb_ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *parg) { - struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; - struct dvb_net *dvbnet = (struct dvb_net *) dvbdev->priv; + struct dvb_device *dvbdev = file->private_data; + struct dvb_net *dvbnet = dvbdev->priv; if (((file->f_flags&O_ACCMODE)==O_RDONLY)) return -EPERM; @@ -1080,7 +1080,7 @@ static int dvb_net_do_ioctl(struct inode switch (cmd) { case NET_ADD_IF: { - struct dvb_net_if *dvbnetif=(struct dvb_net_if *)parg; + struct dvb_net_if *dvbnetif = parg; int result; if (!capable(CAP_SYS_ADMIN)) @@ -1101,14 +1101,14 @@ static int dvb_net_do_ioctl(struct inode { struct net_device *netdev; 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 || !dvbnet->state[dvbnetif->if_num]) return -EINVAL; netdev = dvbnet->device[dvbnetif->if_num]; - priv_data=(struct dvb_net_priv*)netdev->priv; + priv_data = netdev->priv; dvbnetif->pid=priv_data->pid; dvbnetif->feedtype=priv_data->feedtype; break; @@ -1122,7 +1122,7 @@ static int dvb_net_do_ioctl(struct inode /* binary compatiblity cruft */ 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; if (!capable(CAP_SYS_ADMIN)) @@ -1143,14 +1143,14 @@ static int dvb_net_do_ioctl(struct inode { struct net_device *netdev; 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 || !dvbnet->state[dvbnetif->if_num]) return -EINVAL; netdev = dvbnet->device[dvbnetif->if_num]; - priv_data=(struct dvb_net_priv*)netdev->priv; + priv_data = netdev->priv; dvbnetif->pid=priv_data->pid; break; }