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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index 9c9e308d0917..679dfdb6807f 100644
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
@@ -419,9 +419,9 @@ int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
 
         for (i = 0; i < buf->npages; ++i)
                 if (buf->nbufs == 1)
-                        page_list[i] = buf->u.direct.map + (i << buf->page_shift);
+                        page_list[i] = buf->direct.map + (i << buf->page_shift);
                 else
-                        page_list[i] = buf->u.page_list[i].map;
+                        page_list[i] = buf->page_list[i].map;
 
         err = mlx4_write_mtt(dev, mtt, 0, buf->npages, page_list);