Merge git://git.infradead.org/users/willy/linux-nvme

[cascardo/linux.git] / sound / soc / samsung / idma.c

diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index 3d5cf15..8cc5770 100644 (file)
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -274,7 +274,7 @@ static irqreturn_t iis_irq(int irqno, void *dev_id)
 
                addr = readl(idma.regs + I2SLVL0ADDR) - idma.lp_tx_addr;
                addr += prtd->periodsz;
-               addr %= (prtd->end - prtd->start);
+               addr %= (u32)(prtd->end - prtd->start);
                addr += idma.lp_tx_addr;
 
                writel(addr, idma.regs + I2SLVL0ADDR);
@@ -413,13 +413,7 @@ static int asoc_idma_platform_probe(struct platform_device *pdev)
        if (idma_irq < 0)
                return idma_irq;
 
-       return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
-}
-
-static int asoc_idma_platform_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_platform(&pdev->dev);
-       return 0;
+       return devm_snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
 }
 
 static struct platform_driver asoc_idma_driver = {
@@ -429,7 +423,6 @@ static struct platform_driver asoc_idma_driver = {
        },
 
        .probe = asoc_idma_platform_probe,
-       .remove = asoc_idma_platform_remove,
 };
 
 module_platform_driver(asoc_idma_driver);