Commit 7c40ba65 authored by Rylan Dmello's avatar Rylan Dmello Committed by Greg Kroah-Hartman

staging: qlge: Remove gotos from ql_set_mac_addr_reg

As suggested by Joe Perches, this patch removes the 'exit' label
from the ql_set_mac_addr_reg function and replaces the goto
statements with break statements.
Signed-off-by: default avatarRylan Dmello <mail@rylan.coffee>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/a6f485e43eb55e8fdc64a7a346cb0419b55c3cb6.1588209862.git.mail@rylan.coffeeSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d9a39e0
...@@ -336,22 +336,20 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, ...@@ -336,22 +336,20 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
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) if (status)
goto exit; break;
ql_write32(qdev, MAC_ADDR_IDX, ql_write32(qdev, MAC_ADDR_IDX,
(offset++) | (index << MAC_ADDR_IDX_SHIFT) | type | (offset++) | (index << MAC_ADDR_IDX_SHIFT) | type |
MAC_ADDR_E); MAC_ADDR_E);
ql_write32(qdev, MAC_ADDR_DATA, lower); 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) if (status)
goto exit; break;
ql_write32(qdev, MAC_ADDR_IDX, ql_write32(qdev, MAC_ADDR_IDX,
(offset++) | (index << MAC_ADDR_IDX_SHIFT) | type | (offset++) | (index << MAC_ADDR_IDX_SHIFT) | type |
MAC_ADDR_E); MAC_ADDR_E);
ql_write32(qdev, MAC_ADDR_DATA, upper); 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; break;
} }
case MAC_ADDR_TYPE_CAM_MAC: { case MAC_ADDR_TYPE_CAM_MAC: {
...@@ -361,7 +359,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, ...@@ -361,7 +359,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
(addr[5]); (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) if (status)
goto exit; break;
ql_write32(qdev, MAC_ADDR_IDX, ql_write32(qdev, MAC_ADDR_IDX,
(offset++) | /* offset */ (offset++) | /* offset */
(index << MAC_ADDR_IDX_SHIFT) | /* index */ (index << MAC_ADDR_IDX_SHIFT) | /* index */
...@@ -369,7 +367,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, ...@@ -369,7 +367,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
ql_write32(qdev, MAC_ADDR_DATA, lower); 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) if (status)
goto exit; break;
ql_write32(qdev, MAC_ADDR_IDX, ql_write32(qdev, MAC_ADDR_IDX,
(offset++) | /* offset */ (offset++) | /* offset */
(index << MAC_ADDR_IDX_SHIFT) | /* index */ (index << MAC_ADDR_IDX_SHIFT) | /* index */
...@@ -377,7 +375,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, ...@@ -377,7 +375,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
ql_write32(qdev, MAC_ADDR_DATA, upper); 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) if (status)
goto exit; break;
ql_write32(qdev, MAC_ADDR_IDX, ql_write32(qdev, MAC_ADDR_IDX,
(offset) | /* offset */ (offset) | /* offset */
(index << MAC_ADDR_IDX_SHIFT) | /* index */ (index << MAC_ADDR_IDX_SHIFT) | /* index */
...@@ -404,7 +402,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, ...@@ -404,7 +402,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
*/ */
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) if (status)
goto exit; break;
ql_write32(qdev, MAC_ADDR_IDX, ql_write32(qdev, MAC_ADDR_IDX,
offset | /* offset */ offset | /* offset */
(index << MAC_ADDR_IDX_SHIFT) | /* index */ (index << MAC_ADDR_IDX_SHIFT) | /* index */
...@@ -418,7 +416,6 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, ...@@ -418,7 +416,6 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
"Address type %d not yet supported.\n", type); "Address type %d not yet supported.\n", type);
status = -EPERM; status = -EPERM;
} }
exit:
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment