Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / pm8921-core.c

diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 1153e8a3a556e677e2f9040bf5b73c6daec821d2..b97a97187ae992ebe9f1b55cb511636b012fde4c 100644 (file)
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -394,9 +394,8 @@ static int pm8921_probe(struct platform_device *pdev)
 {
        struct pm8921 *pmic;
        struct regmap *regmap;
-       int rc;
+       int irq, rc;
        unsigned int val;
-       unsigned int irq;
        u32 rev;
        struct pm_irq_chip *chip;
        unsigned int nirqs = PM8921_NR_IRQS;