enic: Use (netdev|dev|pr)_<level> macro helpers for logging

[net-next-2.6.git] / drivers / net / enic / vnic_rq.c

diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c
index e186efaf9da1fc0c5d552fdb90aac7885b553a86..6d84ca840052a274b5110bce6dfeaed4b30ebd6a 100644 (file)
--- a/drivers/net/enic/vnic_rq.c
+++ b/drivers/net/enic/vnic_rq.c
@@ -39,7 +39,7 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
        for (i = 0; i < blks; i++) {
                rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC);
                if (!rq->bufs[i]) {
-                       printk(KERN_ERR "Failed to alloc rq_bufs\n");
+                       pr_err("Failed to alloc rq_bufs\n");
                        return -ENOMEM;
                }
        }
@@ -94,7 +94,7 @@ 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) {
-               printk(KERN_ERR "Failed to hook RQ[%d] resource\n", index);
+               pr_err("Failed to hook RQ[%d] resource\n", index);
                return -EINVAL;
        }
 
@@ -168,13 +168,13 @@ int vnic_rq_disable(struct vnic_rq *rq)
        iowrite32(0, &rq->ctrl->enable);
 
        /* Wait for HW to ACK disable request */
-       for (wait = 0; wait < 100; wait++) {
+       for (wait = 0; wait < 1000; wait++) {
                if (!(ioread32(&rq->ctrl->running)))
                        return 0;
-               udelay(1);
+               udelay(10);
        }
 
-       printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index);
+       pr_err("Failed to disable RQ[%d]\n", rq->index);
 
        return -ETIMEDOUT;
 }