Use existing str_plural() function rather than duplicating its implementation. ./drivers/scsi/libsas/sas_init.c:426:7-8: opportunity for str_plural(i). Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9351 Signed-off-by: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx> --- drivers/scsi/libsas/sas_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index 9c8cc723170d..67017c03d4da 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -422,8 +422,8 @@ static void _sas_resume_ha(struct sas_ha_struct *ha, bool drain) */ i = phys_suspended(ha); if (i) - dev_info(ha->dev, "waiting up to 25 seconds for %d phy%s to resume\n", - i, i > 1 ? "s" : ""); + dev_info(ha->dev, "waiting up to 25 seconds for %d phy%s to resume\n", i, + str_plural(i)); wait_event_timeout(ha->eh_wait_q, phys_suspended(ha) == 0, tmo); for (i = 0; i < ha->num_phys; i++) { struct asd_sas_phy *phy = ha->sas_phy[i]; -- 2.20.1.7.g153144c
