be2net: remove desc field from be_eq_obj

The event queue description (be_eq_obj.desc) field is used only to format
string for IRQ name and it is not really needed to hold this value.
Remove it and use local variable to format string for IRQ name.

Signed-off-by: Ivan Vecera <cera@cera.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index a4604dea45601b5200fdd0f98a333242d03059d2..e71e5e5926266a94057aaa9595219cf08e9daaff 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -185,7 +185,6 @@ static inline void queue_tail_inc(struct be_queue_info *q)
 
 struct be_eq_obj {
        struct be_queue_info q;
-       char desc[32];
 
        u8 idx;                 /* array index */
        u8 msix_idx;

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 8f755009ff3820e34fa1501970054513cf5198ce..05e4c0bb25f44c96038bc5b268adf2d921c22d0a 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3403,9 +3403,11 @@ static int be_msix_register(struct be_adapter *adapter)
        int status, i, vec;
 
        for_all_evt_queues(adapter, eqo, i) {
-               sprintf(eqo->desc, "%s-q%d", netdev->name, i);
+               char irq_name[IFNAMSIZ+4];
+
+               snprintf(irq_name, sizeof(irq_name), "%s-q%d", netdev->name, i);
                vec = be_msix_vec_get(adapter, eqo);
-               status = request_irq(vec, be_msix, 0, eqo->desc, eqo);
+               status = request_irq(vec, be_msix, 0, irq_name, eqo);
                if (status)
                        goto err_msix;