staging: qlge: fix else after return or break
Remove unnecessary elses after return or break. Signed-off-by: Coiby Xu <coiby.xu@gmail.com> Link: https://lore.kernel.org/r/20200625215755.70329-3-coiby.xu@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1113c90c48
commit
e42f623c3a
|
@ -1391,12 +1391,11 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)
|
||||||
pr_err("%s: Failed read of mac index register\n",
|
pr_err("%s: Failed read of mac index register\n",
|
||||||
__func__);
|
__func__);
|
||||||
return;
|
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]);
|
|
||||||
}
|
}
|
||||||
|
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++) {
|
for (i = 0; i < 32; i++) {
|
||||||
if (ql_get_mac_addr_reg
|
if (ql_get_mac_addr_reg
|
||||||
|
@ -1404,11 +1403,10 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)
|
||||||
pr_err("%s: Failed read of mac index register\n",
|
pr_err("%s: Failed read of mac index register\n",
|
||||||
__func__);
|
__func__);
|
||||||
return;
|
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]);
|
|
||||||
}
|
}
|
||||||
|
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);
|
ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);
|
||||||
}
|
}
|
||||||
|
@ -1427,11 +1425,10 @@ void ql_dump_routing_entries(struct ql_adapter *qdev)
|
||||||
pr_err("%s: Failed read of routing index register\n",
|
pr_err("%s: Failed read of routing index register\n",
|
||||||
__func__);
|
__func__);
|
||||||
return;
|
return;
|
||||||
} else {
|
|
||||||
if (value)
|
|
||||||
pr_err("%s: Routing Mask %d = 0x%.08x\n",
|
|
||||||
qdev->ndev->name, i, value);
|
|
||||||
}
|
}
|
||||||
|
if (value)
|
||||||
|
pr_err("%s: Routing Mask %d = 0x%.08x\n",
|
||||||
|
qdev->ndev->name, i, value);
|
||||||
}
|
}
|
||||||
ql_sem_unlock(qdev, SEM_RT_IDX_MASK);
|
ql_sem_unlock(qdev, SEM_RT_IDX_MASK);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3778,10 +3778,10 @@ static int ql_wol(struct ql_adapter *qdev)
|
||||||
"Failed to set magic packet on %s.\n",
|
"Failed to set magic packet on %s.\n",
|
||||||
qdev->ndev->name);
|
qdev->ndev->name);
|
||||||
return status;
|
return status;
|
||||||
} else
|
}
|
||||||
netif_info(qdev, drv, qdev->ndev,
|
netif_info(qdev, drv, qdev->ndev,
|
||||||
"Enabled magic packet successfully on %s.\n",
|
"Enabled magic packet successfully on %s.\n",
|
||||||
qdev->ndev->name);
|
qdev->ndev->name);
|
||||||
|
|
||||||
wol |= MB_WOL_MAGIC_PKT;
|
wol |= MB_WOL_MAGIC_PKT;
|
||||||
}
|
}
|
||||||
|
|
|
@ -276,8 +276,8 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp)
|
||||||
netif_err(qdev, ifup, qdev->ndev,
|
netif_err(qdev, ifup, qdev->ndev,
|
||||||
"Failed to init CAM/Routing tables.\n");
|
"Failed to init CAM/Routing tables.\n");
|
||||||
return;
|
return;
|
||||||
} else
|
}
|
||||||
clear_bit(QL_CAM_RT_SET, &qdev->flags);
|
clear_bit(QL_CAM_RT_SET, &qdev->flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Queue up a worker to check the frame
|
/* Queue up a worker to check the frame
|
||||||
|
|
Loading…
Reference in a new issue