Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[karo-tx-linux.git] / drivers / media / rc / ir-hix5hd2.c

diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
index 58ec5986274ed79b0191a440696912e38f940e0b..1c087cb76815a3ab488cb53db85cf98b5b0cac80 100644 (file)
--- a/drivers/media/rc/ir-hix5hd2.c
+++ b/drivers/media/rc/ir-hix5hd2.c
@@ -63,7 +63,7 @@
 
 struct hix5hd2_ir_priv {
        int                     irq;
-       void volatile __iomem   *base;
+       void __iomem            *base;
        struct device           *dev;
        struct rc_dev           *rdev;
        struct regmap           *regmap;
@@ -213,8 +213,8 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        priv->base = devm_ioremap_resource(dev, res);
-       if (IS_ERR((__force void *)priv->base))
-               return PTR_ERR((__force void *)priv->base);
+       if (IS_ERR(priv->base))
+               return PTR_ERR(priv->base);
 
        priv->irq = platform_get_irq(pdev, 0);
        if (priv->irq < 0) {
@@ -319,7 +319,7 @@ static int hix5hd2_ir_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend,
                         hix5hd2_ir_resume);
 
-static struct of_device_id hix5hd2_ir_table[] = {
+static const struct of_device_id hix5hd2_ir_table[] = {
        { .compatible = "hisilicon,hix5hd2-ir", },
        {},
 };