openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (6311): dvb: Replace list_for_each+list_entry with list_for_each_entry 

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Trent Piepho 2007-10-10 05:37:39 -03:00 committed by Mauro Carvalho Chehab
parent c3e2a8e64c
commit 7948261942
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/dvb/dvb-core/dvb_demux.c
View File

@ -373,13 +373,10 @@ static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed,
static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
{ {
struct dvb_demux_feed *feed; struct dvb_demux_feed *feed;
struct list_head *pos, *head = &demux->feed_list;
u16 pid = ts_pid(buf); u16 pid = ts_pid(buf);
int dvr_done = 0; int dvr_done = 0;
list_for_each(pos, head) { list_for_each_entry(feed, &demux->feed_list, list_head) {
feed = list_entry(pos, struct dvb_demux_feed, list_head);
if ((feed->pid != pid) && (feed->pid != 0x2000)) if ((feed->pid != pid) && (feed->pid != 0x2000))
continue; continue;

27
drivers/media/dvb/dvb-core/dvbdev.c
View File

@ -58,18 +58,13 @@ static struct class *dvb_class;
static struct dvb_device* dvbdev_find_device (int minor) static struct dvb_device* dvbdev_find_device (int minor)
{ {
struct list_head *entry; struct dvb_adapter *adap;
list_for_each (entry, &dvb_adapter_list) { list_for_each_entry(adap, &dvb_adapter_list, list_head) {
struct list_head *entry0; struct dvb_device *dev;
struct dvb_adapter *adap; list_for_each_entry(dev, &adap->device_list, list_head)
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);
if (nums2minor(adap->num, dev->type, dev->id) == minor) if (nums2minor(adap->num, dev->type, dev->id) == minor)
return dev; return dev;
}
} }
return NULL; return NULL;
@ -179,13 +174,10 @@ static int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
u32 id = 0; u32 id = 0;
while (id < DVB_MAX_IDS) { while (id < DVB_MAX_IDS) {
struct list_head *entry; struct dvb_device *dev;
list_for_each (entry, &adap->device_list) { list_for_each_entry(dev, &adap->device_list, list_head)
struct dvb_device *dev;
dev = list_entry (entry, struct dvb_device, list_head);
if (dev->type == type && dev->id == id) if (dev->type == type && dev->id == id)
goto skip; goto skip;
}
return id; return id;
skip: skip:
id++; id++;
@ -279,13 +271,10 @@ static int dvbdev_get_free_adapter_num (void)
int num = 0; int num = 0;
while (num < DVB_MAX_ADAPTERS) { while (num < DVB_MAX_ADAPTERS) {
struct list_head *entry; struct dvb_adapter *adap;
list_for_each (entry, &dvb_adapter_list) { list_for_each_entry(adap, &dvb_adapter_list, list_head)
struct dvb_adapter *adap;
adap = list_entry (entry, struct dvb_adapter, list_head);
if (adap->num == num) if (adap->num == num)
goto skip; goto skip;
}
return num; return num;
skip: skip:
num++; num++;