static inline struct dmabounce_device_info *
 find_dmabounce_dev(struct device *dev)
 {
-       struct list_head *entry;
-
-       list_for_each(entry, &dmabounce_devs) {
-               struct dmabounce_device_info *d =
-                       list_entry(entry, struct dmabounce_device_info, node);
+       struct dmabounce_device_info *d;
 
+       list_for_each_entry(d, &dmabounce_devs, node)
                if (d->dev == dev)
                        return d;
-       }
+
        return NULL;
 }
 
 static inline struct safe_buffer *
 find_safe_buffer(struct dmabounce_device_info *device_info, dma_addr_t safe_dma_addr)
 {
-       struct list_head *entry;
-
-       list_for_each(entry, &device_info->safe_buffers) {
-               struct safe_buffer *b =
-                       list_entry(entry, struct safe_buffer, node);
+       struct safe_buffer *b;
 
+       list_for_each_entry(b, &device_info->safe_buffers, node)
                if (b->safe_dma_addr == safe_dma_addr)
                        return b;
-       }
 
        return NULL;
 }
                        __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr),
                        buf->safe, (void *) buf->safe_dma_addr);
 
-
                DO_STATS ( device_info->bounce_count++ );
 
                if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {