Merge tag 'bitmap-5.17-rc1' of git://github.com/norov/linux

[linux-2.6-microblaze.git] / drivers / soc / ti / k3-ringacc.c

diff --git a/drivers/soc/ti/k3-ringacc.c b/drivers/soc/ti/k3-ringacc.c
index 573be88..31ab6c6 100644 (file)
--- a/drivers/soc/ti/k3-ringacc.c
+++ b/drivers/soc/ti/k3-ringacc.c
@@ -647,7 +647,7 @@ int k3_ringacc_get_ring_irq_num(struct k3_ring *ring)
        if (!ring)
                return -EINVAL;
 
-       irq_num = ti_sci_inta_msi_get_virq(ring->parent->dev, ring->ring_id);
+       irq_num = msi_get_virq(ring->parent->dev, ring->ring_id);
        if (irq_num <= 0)
                irq_num = -EINVAL;
        return irq_num;
@@ -1356,9 +1356,9 @@ static int k3_ringacc_init(struct platform_device *pdev,
        struct resource *res;
        int ret, i;
 
-       dev->msi_domain = of_msi_get_domain(dev, dev->of_node,
+       dev->msi.domain = of_msi_get_domain(dev, dev->of_node,
                                            DOMAIN_BUS_TI_SCI_INTA_MSI);
-       if (!dev->msi_domain) {
+       if (!dev->msi.domain) {
                dev_err(dev, "Failed to get MSI domain\n");
                return -EPROBE_DEFER;
        }