New upstream version 17.11-rc3

[deb_dpdk.git] / drivers / net / enic / base / vnic_rq.c

diff --git a/drivers/net/enic/base/vnic_rq.c b/drivers/net/enic/base/vnic_rq.c
index 10a40c1..ea297ee 100644 (file)
--- a/drivers/net/enic/base/vnic_rq.c
+++ b/drivers/net/enic/base/vnic_rq.c
@@ -58,13 +58,13 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
 
        rq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_RQ, index);
        if (!rq->ctrl) {
-               pr_err("Failed to hook RQ[%d] resource\n", index);
+               pr_err("Failed to hook RQ[%u] resource\n", index);
                return -EINVAL;
        }
 
        vnic_rq_disable(rq);
 
-       snprintf(res_name, sizeof(res_name), "%d-rq-%d", instance++, index);
+       snprintf(res_name, sizeof(res_name), "%d-rq-%u", instance++, index);
        rc = vnic_dev_alloc_desc_ring(vdev, &rq->ring, desc_count, desc_size,
                rq->socket_id, res_name);
        return rc;
@@ -118,11 +118,6 @@ void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
        rq->pkt_last_seg = NULL;
 }
 
-void vnic_rq_error_out(struct vnic_rq *rq, unsigned int error)
-{
-       iowrite32(error, &rq->ctrl->error_status);
-}
-
 unsigned int vnic_rq_error_status(struct vnic_rq *rq)
 {
        return ioread32(&rq->ctrl->error_status);