Commit 7d9a39e0 authored by Rylan Dmello's avatar Rylan Dmello Committed by Greg Kroah-Hartman
Browse files

staging: qlge: Fix indentation in ql_set_mac_addr_reg 



Based on Joe Perches' feedback, fix the indentation throughout
ql_set_mac_addr_reg. This helps fix several "line over 80 characters"
warnings along with the original "multiple line dereference" warning.

Fix checkpatch.pl warnings:

  WARNING: Avoid multiple line dereference - prefer 'qdev->func'
  WARNING: line over 80 characters

Signed-off-by: default avatarRylan Dmello <mail@rylan.coffee>
Link: https://lore.kernel.org/r/299f2cb3b7d4efa30b44d4d1defbcd5f54bd7eaf.1588209862.git.mail@rylan.coffee


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3881eb5

drivers/staging/qlge/qlge_main.c

+78 −89
Original line number Diff line number Diff line
@@ -329,66 +329,57 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, 
	int status = 0;



	switch (type) {

	case MAC_ADDR_TYPE_MULTI_MAC:

		{

	case MAC_ADDR_TYPE_MULTI_MAC: {

		u32 upper = (addr[0] << 8) | addr[1];

			u32 lower = (addr[2] << 24) | (addr[3] << 16) |

					(addr[4] << 8) | (addr[5]);

		u32 lower = (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |

			    (addr[5]);



			status =

				ql_wait_reg_rdy(qdev,

						MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		if (status)

			goto exit;

			ql_write32(qdev, MAC_ADDR_IDX, (offset++) |

				(index << MAC_ADDR_IDX_SHIFT) |

				type | MAC_ADDR_E);

		ql_write32(qdev, MAC_ADDR_IDX,

			   (offset++) | (index << MAC_ADDR_IDX_SHIFT) | type |

				   MAC_ADDR_E);

		ql_write32(qdev, MAC_ADDR_DATA, lower);

			status =

				ql_wait_reg_rdy(qdev,

						MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		if (status)

			goto exit;

			ql_write32(qdev, MAC_ADDR_IDX, (offset++) |

				(index << MAC_ADDR_IDX_SHIFT) |

				type | MAC_ADDR_E);

		ql_write32(qdev, MAC_ADDR_IDX,

			   (offset++) | (index << MAC_ADDR_IDX_SHIFT) | type |

				   MAC_ADDR_E);



		ql_write32(qdev, MAC_ADDR_DATA, upper);

			status =

				ql_wait_reg_rdy(qdev,

						MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		if (status)

			goto exit;

		break;

	}

	case MAC_ADDR_TYPE_CAM_MAC:

		{

	case MAC_ADDR_TYPE_CAM_MAC: {

		u32 cam_output;

		u32 upper = (addr[0] << 8) | addr[1];

			u32 lower =

			    (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |

		u32 lower = (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |

			    (addr[5]);

			status =

			    ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		if (status)

			goto exit;

			ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */

		ql_write32(qdev, MAC_ADDR_IDX,

			   (offset++) | /* offset */

				   (index << MAC_ADDR_IDX_SHIFT) | /* index */

				   type); /* type */

		ql_write32(qdev, MAC_ADDR_DATA, lower);

			status =

			    ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		if (status)

			goto exit;

			ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */

		ql_write32(qdev, MAC_ADDR_IDX,

			   (offset++) | /* offset */

				   (index << MAC_ADDR_IDX_SHIFT) | /* index */

				   type); /* type */

		ql_write32(qdev, MAC_ADDR_DATA, upper);

			status =

			    ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		if (status)

			goto exit;

			ql_write32(qdev, MAC_ADDR_IDX, (offset) |	/* offset */

		ql_write32(qdev, MAC_ADDR_IDX,

			   (offset) | /* offset */

				   (index << MAC_ADDR_IDX_SHIFT) | /* index */

				   type); /* type */

		/* This field should also include the queue id
@@ -396,8 +387,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, 
		 * the route field to NIC core.

		 */

		cam_output = (CAM_OUT_ROUTE_NIC |

				      (qdev->

				       func << CAM_OUT_FUNC_SHIFT) |

			      (qdev->func << CAM_OUT_FUNC_SHIFT) |

			      (0 << CAM_OUT_CQ_ID_SHIFT));

		if (qdev->ndev->features & NETIF_F_HW_VLAN_CTAG_RX)

			cam_output |= CAM_OUT_RV;
@@ -405,19 +395,18 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, 
		ql_write32(qdev, MAC_ADDR_DATA, cam_output);

		break;

	}

	case MAC_ADDR_TYPE_VLAN:

		{

	case MAC_ADDR_TYPE_VLAN: {

		u32 enable_bit = *((u32 *)&addr[0]);

		/* For VLAN, the addr actually holds a bit that

		 * either enables or disables the vlan id we are

		 * addressing. It's either MAC_ADDR_E on or off.

		 * That's bit-27 we're talking about.

		 */

			status =

			    ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);

		if (status)

			goto exit;

			ql_write32(qdev, MAC_ADDR_IDX, offset |	/* offset */

		ql_write32(qdev, MAC_ADDR_IDX,

			   offset | /* offset */

				   (index << MAC_ADDR_IDX_SHIFT) | /* index */

				   type | /* type */

				   enable_bit); /* enable/disable */