net: struct device - replace bus_id with dev_name(), dev_set_name()

[linux-2.6-omap-h63xx.git] / drivers / net / ehea / ehea_main.c

diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index dfcdd7f21c786f8c339ab61c06ed4b28c9db3aa3..489fdb90f7647ac1524b4be6c8545b1cd2a25cc9 100644 (file)
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -370,8 +370,6 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
                                                              EHEA_L_PKT_SIZE);
                        if (!skb_arr_rq1[index]) {
                                pr->rq1_skba.os_skbs = fill_wqes - i;
-                               ehea_error("%s: no mem for skb/%d wqes filled",
-                                          dev->name, i);
                                break;
                        }
                }
@@ -387,26 +385,19 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
        ehea_update_rq1a(pr->qp, adder);
 }
 
-static int ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a)
+static void ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a)
 {
-       int ret = 0;
        struct sk_buff **skb_arr_rq1 = pr->rq1_skba.arr;
        struct net_device *dev = pr->port->netdev;
        int i;
 
        for (i = 0; i < pr->rq1_skba.len; i++) {
                skb_arr_rq1[i] = netdev_alloc_skb(dev, EHEA_L_PKT_SIZE);
-               if (!skb_arr_rq1[i]) {
-                       ehea_error("%s: no mem for skb/%d wqes filled",
-                                  dev->name, i);
-                       ret = -ENOMEM;
-                       goto out;
-               }
+               if (!skb_arr_rq1[i])
+                       break;
        }
        /* Ring doorbell */
        ehea_update_rq1a(pr->qp, nr_rq1a);
-out:
-       return ret;
 }
 
 static int ehea_refill_rq_def(struct ehea_port_res *pr,
@@ -435,10 +426,12 @@ static int ehea_refill_rq_def(struct ehea_port_res *pr,
                u64 tmp_addr;
                struct sk_buff *skb = netdev_alloc_skb(dev, packet_size);
                if (!skb) {
-                       ehea_error("%s: no mem for skb/%d wqes filled",
-                                  pr->port->netdev->name, i);
                        q_skba->os_skbs = fill_wqes - i;
-                       ret = -ENOMEM;
+                       if (q_skba->os_skbs == q_skba->len - 2) {
+                               ehea_info("%s: rq%i ran dry - no mem for skb",
+                                         pr->port->netdev->name, rq_nr);
+                               ret = -ENOMEM;
+                       }
                        break;
                }
                skb_reserve(skb, NET_IP_ALIGN);
@@ -1201,11 +1194,11 @@ static int ehea_fill_port_res(struct ehea_port_res *pr)
        int ret;
        struct ehea_qp_init_attr *init_attr = &pr->qp->init_attr;
 
-       ret = ehea_init_fill_rq1(pr, init_attr->act_nr_rwqes_rq1
-                                    - init_attr->act_nr_rwqes_rq2
-                                    - init_attr->act_nr_rwqes_rq3 - 1);
+       ehea_init_fill_rq1(pr, init_attr->act_nr_rwqes_rq1
+                              - init_attr->act_nr_rwqes_rq2
+                              - init_attr->act_nr_rwqes_rq3 - 1);
 
-       ret |= ehea_refill_rq2(pr, init_attr->act_nr_rwqes_rq2 - 1);
+       ret = ehea_refill_rq2(pr, init_attr->act_nr_rwqes_rq2 - 1);
 
        ret |= ehea_refill_rq3(pr, init_attr->act_nr_rwqes_rq3 - 1);
 
@@ -3040,7 +3033,7 @@ static struct device *ehea_register_port(struct ehea_port *port,
        port->ofdev.dev.parent = &port->adapter->ofdev->dev;
        port->ofdev.dev.bus = &ibmebus_bus_type;
 
-       sprintf(port->ofdev.dev.bus_id, "port%d", port_name_cnt++);
+       dev_set_name(&port->ofdev.dev, "port%d", port_name_cnt++);
        port->ofdev.dev.release = logical_port_release;
 
        ret = of_device_register(&port->ofdev);