Merge branch 'pm-sleep'

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / htc-i2cpld.c

diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index 1bd5b042c8b33b363845eb49ce5e0e161b402601..0c6ff727b2ec97895a83cfaf19d0fd98dfa170af 100644 (file)
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -318,7 +318,6 @@ static int htcpld_setup_chip_irq(
        struct htcpld_data *htcpld;
        struct htcpld_chip *chip;
        unsigned int irq, irq_end;
-       int ret = 0;
 
        /* Get the platform and driver data */
        htcpld = platform_get_drvdata(pdev);
@@ -333,7 +332,7 @@ static int htcpld_setup_chip_irq(
                irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);
        }
 
-       return ret;
+       return 0;
 }
 
 static int htcpld_register_chip_i2c(