lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlx4_core: Clean up struct mlx4_buf

Browse Source 
Now that struct mlx4_buf.u is a struct instead of a union because of
the vmap() changes, there's no point in having a struct at all.  So
move .direct and .page_list directly into struct mlx4_buf and get rid
of a bunch of unnecessary ".u"s.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier
2008-02-06 21:17:59 -08:00
parent 313abe55a8
commit b57aacfa7a
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/mlx4/device.h
View File

@@ -189,10 +189,8 @@ struct mlx4_buf_list {
};
struct mlx4_buf {
struct {
struct mlx4_buf_list direct;
struct mlx4_buf_list *page_list;
} u;
struct mlx4_buf_list direct;
struct mlx4_buf_list *page_list;
int nbufs;
int npages;
int page_shift;
@@ -311,9 +309,9 @@ void mlx4_buf_free(struct mlx4_dev *dev, int size, struct mlx4_buf *buf);
static inline void *mlx4_buf_offset(struct mlx4_buf *buf, int offset)
{
if (BITS_PER_LONG == 64 || buf->nbufs == 1)
return buf->u.direct.buf + offset;
return buf->direct.buf + offset;
else
return buf->u.page_list[offset >> PAGE_SHIFT].buf +
return buf->page_list[offset >> PAGE_SHIFT].buf +
(offset & (PAGE_SIZE - 1));
}