diff options
| author | Roland Dreier <rolandd@cisco.com> | 2008-02-06 21:17:59 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-02-06 21:17:59 -0800 |
| commit | b57aacfa7a95328f469d0360e49289b023c47e9e (patch) | |
| tree | 5642416e92540b93ffb1221ae75b3f1f43ffcd7b /include/linux | |
| parent | 313abe55a87bc10e55d00f337d609e17ad5f8c9a (diff) | |
| download | op-kernel-dev-b57aacfa7a95328f469d0360e49289b023c47e9e.zip op-kernel-dev-b57aacfa7a95328f469d0360e49289b023c47e9e.tar.gz | |
mlx4_core: Clean up struct mlx4_buf
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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 6316077..4210ac4 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -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)); } |
