Commit e42f623c authored by Coiby Xu's avatar Coiby Xu Committed by Greg Kroah-Hartman
Browse files

staging: qlge: fix else after return or break 



Remove unnecessary elses after return or break.

Signed-off-by: default avatarCoiby Xu <coiby.xu@gmail.com>
Link: https://lore.kernel.org/r/20200625215755.70329-3-coiby.xu@gmail.com


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

drivers/staging/qlge/qlge_dbg.c

+10 −13
Original line number Diff line number Diff line
@@ -1391,25 +1391,23 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev) 
			pr_err("%s: Failed read of mac index register\n",

			       __func__);

			return;

		} else {

		}

		if (value[0])

			pr_err("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n",

			       qdev->ndev->name, i, value[1], value[0],

			       value[2]);

	}

	}

	for (i = 0; i < 32; i++) {

		if (ql_get_mac_addr_reg

		    (qdev, MAC_ADDR_TYPE_MULTI_MAC, i, value)) {

			pr_err("%s: Failed read of mac index register\n",

			       __func__);

			return;

		} else {

		}

		if (value[0])

			pr_err("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n",

			       qdev->ndev->name, i, value[1], value[0]);

	}

	}

	ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);

}
@@ -1427,12 +1425,11 @@ void ql_dump_routing_entries(struct ql_adapter *qdev) 
			pr_err("%s: Failed read of routing index register\n",

			       __func__);

			return;

		} else {

		}

		if (value)

			pr_err("%s: Routing Mask %d = 0x%.08x\n",

			       qdev->ndev->name, i, value);

	}

	}

	ql_sem_unlock(qdev, SEM_RT_IDX_MASK);

}

drivers/staging/qlge/qlge_main.c

+4 −4
Original line number Diff line number Diff line
@@ -3778,7 +3778,7 @@ static int ql_wol(struct ql_adapter *qdev) 
				  "Failed to set magic packet on %s.\n",

				  qdev->ndev->name);

			return status;

		} else

		}

		netif_info(qdev, drv, qdev->ndev,

			   "Enabled magic packet successfully on %s.\n",

			   qdev->ndev->name);

drivers/staging/qlge/qlge_mpi.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) 
			netif_err(qdev, ifup, qdev->ndev,

				  "Failed to init CAM/Routing tables.\n");

			return;

		} else

		}

		clear_bit(QL_CAM_RT_SET, &qdev->flags);

	}