|
@@ -2835,8 +2835,8 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
|
|
|
#define for_each_sgt_dma(__dmap, __iter, __sgt) \
|
|
|
for ((__iter) = __sgt_iter((__sgt)->sgl, true); \
|
|
|
((__dmap) = (__iter).dma + (__iter).curr); \
|
|
|
- (((__iter).curr += PAGE_SIZE) < (__iter).max) || \
|
|
|
- ((__iter) = __sgt_iter(__sg_next((__iter).sgp), true), 0))
|
|
|
+ (((__iter).curr += PAGE_SIZE) >= (__iter).max) ? \
|
|
|
+ (__iter) = __sgt_iter(__sg_next((__iter).sgp), true), 0 : 0)
|
|
|
|
|
|
/**
|
|
|
* for_each_sgt_page - iterate over the pages of the given sg_table
|
|
@@ -2848,8 +2848,8 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
|
|
|
for ((__iter) = __sgt_iter((__sgt)->sgl, false); \
|
|
|
((__pp) = (__iter).pfn == 0 ? NULL : \
|
|
|
pfn_to_page((__iter).pfn + ((__iter).curr >> PAGE_SHIFT))); \
|
|
|
- (((__iter).curr += PAGE_SIZE) < (__iter).max) || \
|
|
|
- ((__iter) = __sgt_iter(__sg_next((__iter).sgp), false), 0))
|
|
|
+ (((__iter).curr += PAGE_SIZE) >= (__iter).max) ? \
|
|
|
+ (__iter) = __sgt_iter(__sg_next((__iter).sgp), false), 0 : 0)
|
|
|
|
|
|
static inline unsigned int i915_sg_segment_size(void)
|
|
|
{
|