From: Minghao Chi <chi.minghao@xxxxxxxxxx> As stated in [1], dma_set_mask() with a 64-bit mask never fails if dev->dma_mask is non-NULL. So, if it fails, the 32 bits case will also fail for the same reason. Simplify code and remove some dead code accordingly. [1]: https://lore.kernel.org/linux-kernel/YL3vSPK5DXTNvgdx@xxxxxxxxxxxxx/#t Reported-by: Zeal Robot <zealci@xxxxxxxxxx> Signed-off-by: Minghao Chi <chi.minghao@xxxxxxxxxx> --- drivers/scsi/ipr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 104bee9b3a9d..dd8b32b00c9b 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -10261,11 +10261,8 @@ static int ipr_probe_ioa(struct pci_dev *pdev, if (ioa_cfg->sis64) { rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); - if (rc < 0) { + if (rc < 0) dev_dbg(&pdev->dev, "Failed to set 64 bit DMA mask\n"); - rc = dma_set_mask_and_coherent(&pdev->dev, - DMA_BIT_MASK(32)); - } } else rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); -- 2.25.1
