net: mvpp2: simplify mvpp2_bm_bufs_add()

The mvpp2_bm_bufs_add() currently creates a fake cookie by calling
mvpp2_bm_cookie_pool_set(), just to be able to call
mvpp2_pool_refill(). But all what mvpp2_pool_refill() does is extract
the pool ID from the cookie, and call mvpp2_bm_pool_put() with this ID.

Instead of doing this convoluted thing, just call mvpp2_bm_pool_put()
directly, since we have the BM pool ID.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 93eb1f2dd47a6bc9d49c108ec06d7c8b2620d30f..365180d456df6b32ab7096183bc1d1543db8091f 100644 (file)
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -2390,7 +2390,6 @@ static int mvpp2_bm_bufs_add(struct mvpp2_port *port,
                             struct mvpp2_bm_pool *bm_pool, int buf_num)
 {
        int i;
-       u32 bm;
 
        if (buf_num < 0 ||
            (buf_num + bm_pool->buf_num > bm_pool->size)) {
@@ -2400,10 +2399,11 @@ static int mvpp2_bm_bufs_add(struct mvpp2_port *port,
                return 0;
        }
 
-       bm = mvpp2_bm_cookie_pool_set(0, bm_pool->id);
        for (i = 0; i < buf_num; i++) {
-               mvpp2_pool_refill(port, bm, (u32)buffer_loc.rx_buffer[i],
+               mvpp2_bm_pool_put(port, bm_pool->id,
+                                 (u32)buffer_loc.rx_buffer[i],
                                  (u32)buffer_loc.rx_buffer[i]);
+
        }
 
        /* Update BM driver with number of buffers added to pool */