From a150874a28446c63feb3f30e999a5900248032aa Mon Sep 17 00:00:00 2001 From: "tsung.li" Date: Thu, 14 Apr 2022 00:11:22 +0800 Subject: [PATCH] scsi/hifc: Remove the meaningless null pointer check the rt_cmd field defined in struct card_node is an array it will never be null ------ Signed-off-by: Li Dongsheng --- drivers/scsi/huawei/hifc/hifc_hwdev.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/huawei/hifc/hifc_hwdev.c b/drivers/scsi/huawei/hifc/hifc_hwdev.c index 1629ed0aba36..1e552e7e9fce 100644 --- a/drivers/scsi/huawei/hifc/hifc_hwdev.c +++ b/drivers/scsi/huawei/hifc/hifc_hwdev.c @@ -663,7 +663,7 @@ static bool is_sfp_info_cmd_cached(struct hifc_hwdev *hwdev, struct card_node *chip_node = hwdev->chip_node; sfp_info = buf_in; - if (!chip_node->rt_cmd || sfp_info->port_id >= HIFC_MAX_PORT_ID || + if (sfp_info->port_id >= HIFC_MAX_PORT_ID || *out_size < sizeof(*sfp_info)) return false; @@ -688,8 +688,7 @@ static bool is_sfp_abs_cmd_cached(struct hifc_hwdev *hwdev, struct card_node *chip_node = hwdev->chip_node; abs = buf_in; - if (!chip_node->rt_cmd || abs->port_id >= HIFC_MAX_PORT_ID || - *out_size < sizeof(*abs)) + if (abs->port_id >= HIFC_MAX_PORT_ID || *out_size < sizeof(*abs)) return false; if (abs->version == HIFC_GET_SFP_INFO_REAL_TIME) @@ -3019,9 +3018,6 @@ static void __port_sfp_info_event(struct hifc_hwdev *hwdev, return; } - if (!chip_node->rt_cmd) - return; - rt_cmd = &chip_node->rt_cmd[sfp_info->port_id]; mutex_lock(&chip_node->sfp_mutex); memcpy(&rt_cmd->sfp_info, sfp_info, sizeof(rt_cmd->sfp_info)); @@ -3049,9 +3045,6 @@ static void __port_sfp_abs_event(struct hifc_hwdev *hwdev, return; } - if (!chip_node->rt_cmd) - return; - rt_cmd = &chip_node->rt_cmd[sfp_abs->port_id]; mutex_lock(&chip_node->sfp_mutex); memcpy(&rt_cmd->abs, sfp_abs, sizeof(rt_cmd->abs)); -- Gitee