Merge tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / i2c / busses / i2c-axxia.c

diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
index be3681d..5294b73 100644 (file)
--- a/drivers/i2c/busses/i2c-axxia.c
+++ b/drivers/i2c/busses/i2c-axxia.c
@@ -734,7 +734,6 @@ static int axxia_i2c_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        struct axxia_i2c_dev *idev = NULL;
-       struct resource *res;
        void __iomem *base;
        int ret = 0;
 
@@ -742,16 +741,13 @@ static int axxia_i2c_probe(struct platform_device *pdev)
        if (!idev)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       base = devm_ioremap_resource(&pdev->dev, res);
+       base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(base))
                return PTR_ERR(base);
 
        idev->irq = platform_get_irq(pdev, 0);
-       if (idev->irq < 0) {
-               dev_err(&pdev->dev, "missing interrupt resource\n");
+       if (idev->irq < 0)
                return idev->irq;
-       }
 
        idev->i2c_clk = devm_clk_get(&pdev->dev, "i2c");
        if (IS_ERR(idev->i2c_clk)) {