Merge tag 'sound-6.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-block.git] / drivers / mailbox / hi6220-mailbox.c

diff --git a/drivers/mailbox/hi6220-mailbox.c b/drivers/mailbox/hi6220-mailbox.c
index 560cd09538b1fd2202ebb3cfe12e4f965410ec11..fca61f5312d913628c6d408cfcb4f789f26bd304 100644 (file)
--- a/drivers/mailbox/hi6220-mailbox.c
+++ b/drivers/mailbox/hi6220-mailbox.c
@@ -264,7 +264,6 @@ static int hi6220_mbox_probe(struct platform_device *pdev)
        struct device_node *node = pdev->dev.of_node;
        struct device *dev = &pdev->dev;
        struct hi6220_mbox *mbox;
-       struct resource *res;
        int i, err;
 
        mbox = devm_kzalloc(dev, sizeof(*mbox), GFP_KERNEL);
@@ -287,15 +286,13 @@ static int hi6220_mbox_probe(struct platform_device *pdev)
        if (mbox->irq < 0)
                return mbox->irq;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       mbox->ipc = devm_ioremap_resource(dev, res);
+       mbox->ipc = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(mbox->ipc)) {
                dev_err(dev, "ioremap ipc failed\n");
                return PTR_ERR(mbox->ipc);
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       mbox->base = devm_ioremap_resource(dev, res);
+       mbox->base = devm_platform_ioremap_resource(pdev, 1);
        if (IS_ERR(mbox->base)) {
                dev_err(dev, "ioremap buffer failed\n");
                return PTR_ERR(mbox->base);