Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / media / platform / verisilicon / hantro_drv.c

diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index c0a368bacf8803d9f2dac8b541c8634d48a1ab03..423fc85d79ee36de1a30717aeedc25b9b6288a40 100644 (file)
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -986,7 +986,6 @@ static int hantro_probe(struct platform_device *pdev)
 {
        const struct of_device_id *match;
        struct hantro_dev *vpu;
-       struct resource *res;
        int num_bases;
        int i, ret;
 
@@ -1047,11 +1046,9 @@ static int hantro_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        for (i = 0; i < num_bases; i++) {
-               res = vpu->variant->reg_names ?
-                     platform_get_resource_byname(vpu->pdev, IORESOURCE_MEM,
-                                                  vpu->variant->reg_names[i]) :
-                     platform_get_resource(vpu->pdev, IORESOURCE_MEM, 0);
-               vpu->reg_bases[i] = devm_ioremap_resource(vpu->dev, res);
+               vpu->reg_bases[i] = vpu->variant->reg_names ?
+                     devm_platform_ioremap_resource_byname(pdev, vpu->variant->reg_names[i]) :
+                     devm_platform_ioremap_resource(pdev, 0);
                if (IS_ERR(vpu->reg_bases[i]))
                        return PTR_ERR(vpu->reg_bases[i]);
        }
@@ -1088,8 +1085,8 @@ static int hantro_probe(struct platform_device *pdev)
                        irq_name = "default";
                        irq = platform_get_irq(vpu->pdev, 0);
                }
-               if (irq <= 0)
-                       return -ENXIO;
+               if (irq < 0)
+                       return irq;
 
                ret = devm_request_irq(vpu->dev, irq,
                                       vpu->variant->irqs[i].handler, 0,
@@ -1225,7 +1222,7 @@ static struct platform_driver hantro_driver = {
        .remove_new = hantro_remove,
        .driver = {
                   .name = DRIVER_NAME,
-                  .of_match_table = of_match_ptr(of_hantro_match),
+                  .of_match_table = of_hantro_match,
                   .pm = &hantro_pm_ops,
        },
 };