These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / rc / ir-hix5hd2.c

diff --git a/kernel/drivers/media/rc/ir-hix5hd2.c b/kernel/drivers/media/rc/ir-hix5hd2.c
index 58ec598..d0549fb 100644 (file)
--- a/kernel/drivers/media/rc/ir-hix5hd2.c
+++ b/kernel/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) {
@@ -257,7 +257,7 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
                goto clkerr;
 
        if (devm_request_irq(dev, priv->irq, hix5hd2_ir_rx_interrupt,
-                            IRQF_NO_SUSPEND, pdev->name, priv) < 0) {
+                            0, pdev->name, priv) < 0) {
                dev_err(dev, "IRQ %d register failed\n", priv->irq);
                ret = -EINVAL;
                goto regerr;
@@ -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", },
        {},
 };