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

Commit 4db93fb8 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller
Browse files

qlge: fix duplicated code for different branches 



Refactor code in order to avoid identical code for different branches.

This issue was detected with the help of Coccinelle.

Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5e7dc47

drivers/net/ethernet/qlogic/qlge/qlge_dbg.c

+14 −33
Original line number Diff line number Diff line
@@ -144,42 +144,23 @@ static int ql_get_serdes_regs(struct ql_adapter *qdev, 
	xaui_direct_valid = xaui_indirect_valid = 1;



	/* The XAUI needs to be read out per port */

	if (qdev->func & 1) {

		/* We are NIC 2	*/

	status = ql_read_other_func_serdes_reg(qdev,

			XG_SERDES_XAUI_HSS_PCS_START, &temp);

	if (status)

		temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;



	if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==

				XG_SERDES_ADDR_XAUI_PWR_DOWN)

		xaui_indirect_valid = 0;



		status = ql_read_serdes_reg(qdev,

				XG_SERDES_XAUI_HSS_PCS_START, &temp);

		if (status)

			temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;

	status = ql_read_serdes_reg(qdev, XG_SERDES_XAUI_HSS_PCS_START, &temp);



		if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==

					XG_SERDES_ADDR_XAUI_PWR_DOWN)

			xaui_direct_valid = 0;

	} else {

		/* We are NIC 1	*/

		status = ql_read_other_func_serdes_reg(qdev,

				XG_SERDES_XAUI_HSS_PCS_START, &temp);

	if (status)

		temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;

		if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==

					XG_SERDES_ADDR_XAUI_PWR_DOWN)

			xaui_indirect_valid = 0;



		status = ql_read_serdes_reg(qdev,

				XG_SERDES_XAUI_HSS_PCS_START, &temp);

		if (status)

			temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;

	if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==

				XG_SERDES_ADDR_XAUI_PWR_DOWN)

		xaui_direct_valid = 0;

	}



	/*

	 * XFI register is shared so only need to read one