Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dvb: Kill directly reference of netdev->priv

Simply replace netdev->priv with netdev_priv().

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Wang Chen and committed by
David S. Miller
0eade1f9 c19f7a34

+19 -18
+19 -18
drivers/media/dvb/dvb-core/dvb_net.c
··· 345 345 */ 346 346 static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len ) 347 347 { 348 - struct dvb_net_priv *priv = dev->priv; 348 + struct dvb_net_priv *priv = netdev_priv(dev); 349 349 unsigned long skipped = 0L; 350 350 const u8 *ts, *ts_end, *from_where = NULL; 351 351 u8 ts_remain = 0, how_much = 0, new_ts = 1; ··· 460 460 /* Drop partly decoded SNDU, reset state, resync on PUSI. */ 461 461 if (priv->ule_skb) { 462 462 dev_kfree_skb( priv->ule_skb ); 463 - ((struct dvb_net_priv *) dev->priv)->stats.rx_errors++; 464 - ((struct dvb_net_priv *) dev->priv)->stats.rx_frame_errors++; 463 + priv->stats.rx_errors++; 464 + priv->stats.rx_frame_errors++; 465 465 } 466 466 reset_ule(priv); 467 467 priv->need_pusi = 1; ··· 573 573 if (priv->ule_skb == NULL) { 574 574 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", 575 575 dev->name); 576 - ((struct dvb_net_priv *)dev->priv)->stats.rx_dropped++; 576 + priv->stats.rx_dropped++; 577 577 return; 578 578 } 579 579 ··· 800 800 { 801 801 u8 *eth; 802 802 struct sk_buff *skb; 803 - struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats); 803 + struct net_device_stats *stats = 804 + &((struct dvb_net_priv *) netdev_priv(dev))->stats; 804 805 int snap = 0; 805 806 806 807 /* note: pkt_len includes a 32bit checksum */ ··· 918 917 struct dmx_section_filter **secfilter, 919 918 u8 *mac, u8 *mac_mask) 920 919 { 921 - struct dvb_net_priv *priv = dev->priv; 920 + struct dvb_net_priv *priv = netdev_priv(dev); 922 921 int ret; 923 922 924 923 *secfilter=NULL; ··· 962 961 static int dvb_net_feed_start(struct net_device *dev) 963 962 { 964 963 int ret = 0, i; 965 - struct dvb_net_priv *priv = dev->priv; 964 + struct dvb_net_priv *priv = netdev_priv(dev); 966 965 struct dmx_demux *demux = priv->demux; 967 966 unsigned char *mac = (unsigned char *) dev->dev_addr; 968 967 ··· 1061 1060 1062 1061 static int dvb_net_feed_stop(struct net_device *dev) 1063 1062 { 1064 - struct dvb_net_priv *priv = dev->priv; 1063 + struct dvb_net_priv *priv = netdev_priv(dev); 1065 1064 int i, ret = 0; 1066 1065 1067 1066 dprintk("%s\n", __func__); ··· 1114 1113 1115 1114 static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc) 1116 1115 { 1117 - struct dvb_net_priv *priv = dev->priv; 1116 + struct dvb_net_priv *priv = netdev_priv(dev); 1118 1117 1119 1118 if (priv->multi_num == DVB_NET_MULTICAST_MAX) 1120 1119 return -ENOMEM; ··· 1166 1165 1167 1166 static void dvb_net_set_multicast_list (struct net_device *dev) 1168 1167 { 1169 - struct dvb_net_priv *priv = dev->priv; 1168 + struct dvb_net_priv *priv = netdev_priv(dev); 1170 1169 schedule_work(&priv->set_multicast_list_wq); 1171 1170 } 1172 1171 ··· 1186 1185 1187 1186 static int dvb_net_set_mac (struct net_device *dev, void *p) 1188 1187 { 1189 - struct dvb_net_priv *priv = dev->priv; 1188 + struct dvb_net_priv *priv = netdev_priv(dev); 1190 1189 struct sockaddr *addr=p; 1191 1190 1192 1191 memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); ··· 1200 1199 1201 1200 static int dvb_net_open(struct net_device *dev) 1202 1201 { 1203 - struct dvb_net_priv *priv = dev->priv; 1202 + struct dvb_net_priv *priv = netdev_priv(dev); 1204 1203 1205 1204 priv->in_use++; 1206 1205 dvb_net_feed_start(dev); ··· 1210 1209 1211 1210 static int dvb_net_stop(struct net_device *dev) 1212 1211 { 1213 - struct dvb_net_priv *priv = dev->priv; 1212 + struct dvb_net_priv *priv = netdev_priv(dev); 1214 1213 1215 1214 priv->in_use--; 1216 1215 return dvb_net_feed_stop(dev); ··· 1218 1217 1219 1218 static struct net_device_stats * dvb_net_get_stats(struct net_device *dev) 1220 1219 { 1221 - return &((struct dvb_net_priv*) dev->priv)->stats; 1220 + return &((struct dvb_net_priv *) netdev_priv(dev))->stats; 1222 1221 } 1223 1222 1224 1223 static const struct header_ops dvb_header_ops = { ··· 1288 1287 1289 1288 dvbnet->device[if_num] = net; 1290 1289 1291 - priv = net->priv; 1290 + priv = netdev_priv(net); 1292 1291 priv->net = net; 1293 1292 priv->demux = dvbnet->demux; 1294 1293 priv->pid = pid; ··· 1321 1320 1322 1321 if (!dvbnet->state[num]) 1323 1322 return -EINVAL; 1324 - priv = net->priv; 1323 + priv = netdev_priv(net); 1325 1324 if (priv->in_use) 1326 1325 return -EBUSY; 1327 1326 ··· 1377 1376 1378 1377 netdev = dvbnet->device[dvbnetif->if_num]; 1379 1378 1380 - priv_data = netdev->priv; 1379 + priv_data = netdev_priv(netdev); 1381 1380 dvbnetif->pid=priv_data->pid; 1382 1381 dvbnetif->feedtype=priv_data->feedtype; 1383 1382 break; ··· 1428 1427 1429 1428 netdev = dvbnet->device[dvbnetif->if_num]; 1430 1429 1431 - priv_data = netdev->priv; 1430 + priv_data = netdev_priv(netdev); 1432 1431 dvbnetif->pid=priv_data->pid; 1433 1432 break; 1434 1433 }