| Message ID | 1617108361-6870-1-git-send-email-zhouchuangao@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | message/fusion: Use BUG_ON instead of if condition followed by BUG. | expand |
On Tue, 30 Mar 2021 05:46:01 -0700, zhouchuangao wrote:
> BUG_ON() uses unlikely in if(), which can be optimized at compile time.
Applied to 5.13/scsi-queue, thanks!
[1/1] message/fusion: Use BUG_ON instead of if condition followed by BUG.
https://git.kernel.org/mkp/scsi/c/4dec8004de29
--
Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 5eb0b33..5e425fd 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -3442,14 +3442,12 @@ mptsas_expander_event_add(MPT_ADAPTER *ioc, __le64 sas_address; port_info = kzalloc(sizeof(struct mptsas_portinfo), GFP_KERNEL); - if (!port_info) - BUG(); + BUG_ON(!port_info); port_info->num_phys = (expander_data->NumPhys) ? expander_data->NumPhys : 1; port_info->phy_info = kcalloc(port_info->num_phys, sizeof(struct mptsas_phyinfo), GFP_KERNEL); - if (!port_info->phy_info) - BUG(); + BUG_ON(!port_info->phy_info); memcpy(&sas_address, &expander_data->SASAddress, sizeof(__le64)); for (i = 0; i < port_info->num_phys; i++) { port_info->phy_info[i].portinfo = port_info;
BUG_ON() uses unlikely in if(), which can be optimized at compile time. Signed-off-by: zhouchuangao <zhouchuangao@vivo.com> --- drivers/message/fusion/mptsas.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)