diff --git a/drivers/hisi/ics/cambricon_ipu.c b/drivers/hisi/ics/cambricon_ipu.c index bbcbc23fb46d..53570dfac226 100644 --- a/drivers/hisi/ics/cambricon_ipu.c +++ b/drivers/hisi/ics/cambricon_ipu.c @@ -2519,7 +2519,7 @@ static int cambricon_ipu_probe(struct platform_device *pdev) err = -ENXIO; goto release_res_cfg; } - IOREAD_RANGE(adapter->config_reg_virt_addr, 0xff); + // IOREAD_RANGE(adapter->config_reg_virt_addr, 0xff); if (!ipu_get_feature_tree(&pdev->dev)) { printk(KERN_ERR"[%s]: fatal err, unknown feature tree\n", __func__); @@ -2574,7 +2574,7 @@ static int cambricon_ipu_probe(struct platform_device *pdev) printk(KERN_ERR"[%s]IPU_ERROR:ics_irq_io_addr ioremap fail\n", __func__); goto destroy_device; } - IOREAD_RANGE(adapter->ics_irq_io_addr, 0xff); + // IOREAD_RANGE(adapter->ics_irq_io_addr, 0xff); #endif if (!ipu_smmu_master_get_offset(&pdev->dev)) { diff --git a/drivers/hisi/ics/ipu_clock.c b/drivers/hisi/ics/ipu_clock.c index 7540addd3aa3..d9eeae9d26db 100644 --- a/drivers/hisi/ics/ipu_clock.c +++ b/drivers/hisi/ics/ipu_clock.c @@ -75,7 +75,6 @@ int ipu_clock_init(struct device *dev, struct ics_clock *clk, bool lpm3_set_vcod static int ipu_clock_set(struct ics_clock *clk, unsigned int new_rate) { - int ret; unsigned int target_rate = new_rate; if (new_rate == clk->curr_rate) { diff --git a/drivers/hisi/ics/ipu_smmu_drv.c b/drivers/hisi/ics/ipu_smmu_drv.c index 5e1c67c0491a..386f6f311b4b 100644 --- a/drivers/hisi/ics/ipu_smmu_drv.c +++ b/drivers/hisi/ics/ipu_smmu_drv.c @@ -587,10 +587,6 @@ long ipu_smmu_map(struct map_data *map) iova_size = phys_len; iova_start = ipu_alloc_iova(ipu_iova_pool, iova_size); - unsigned long smmu_scr_addr = (unsigned long)smmu_manager.common_io_addr + smmu_common_reg_offset.smmu_scr; - - unsigned long smmu_mint_addr = (unsigned long)smmu_manager.master_io_addr + smmu_master_reg_offset.smmu_mstr_intmask; - sg_size = iommu_map_sg(ipu_smmu_domain, iova_start, sgl, (unsigned int)sg_nents(sgl), format->prot);