Skip to content

Commit d6d9704

Browse files
iveceradavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c1328a2 commit d6d9704

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/net/ethernet/emulex/benet/be.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ static inline void queue_tail_inc(struct be_queue_info *q)
185185

186186
struct be_eq_obj {
187187
struct be_queue_info q;
188-
char desc[32];
189188

190189
u8 idx; /* array index */
191190
u8 msix_idx;

drivers/net/ethernet/emulex/benet/be_main.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3403,9 +3403,11 @@ static int be_msix_register(struct be_adapter *adapter)
34033403
int status, i, vec;
34043404

34053405
for_all_evt_queues(adapter, eqo, i) {
3406-
sprintf(eqo->desc, "%s-q%d", netdev->name, i);
3406+
char irq_name[IFNAMSIZ+4];
3407+
3408+
snprintf(irq_name, sizeof(irq_name), "%s-q%d", netdev->name, i);
34073409
vec = be_msix_vec_get(adapter, eqo);
3408-
status = request_irq(vec, be_msix, 0, eqo->desc, eqo);
3410+
status = request_irq(vec, be_msix, 0, irq_name, eqo);
34093411
if (status)
34103412
goto err_msix;
34113413

0 commit comments

Comments
 (0)