Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d9704a authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

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: default avatarIvan Vecera <cera@cera.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1328a27

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -185,7 +185,6 @@ static inline void queue_tail_inc(struct be_queue_info *q) 




struct be_eq_obj {

struct be_eq_obj {

	struct be_queue_info q;

	struct be_queue_info q;

	char desc[32];





	u8 idx;			/* array index */

	u8 idx;			/* array index */

	u8 msix_idx;

	u8 msix_idx;

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -3403,9 +3403,11 @@ static int be_msix_register(struct be_adapter *adapter) 
	int status, i, vec;

	int status, i, vec;





	for_all_evt_queues(adapter, eqo, i) {

	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);

		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)

		if (status)

			goto err_msix;

			goto err_msix;