Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

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

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 791aea3e96ce27622032a0c0fd1bc52ecd69203e..be88a3bf7b857a5b19f7e9d95b1be42c7e58b2d3 100644 (file)
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -40,7 +40,7 @@
 #define I2C_ADDR_RTC   (0x0C >> 1)
 #define I2C_ADDR_HAPTIC        (0x90 >> 1)
 
-static struct mfd_cell max8997_devs[] = {
+static const struct mfd_cell max8997_devs[] = {
        { .name = "max8997-pmic", },
        { .name = "max8997-rtc", },
        { .name = "max8997-battery", },
@@ -133,7 +133,6 @@ int max8997_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask)
 }
 EXPORT_SYMBOL_GPL(max8997_update_reg);
 
-#ifdef CONFIG_OF
 /*
  * Only the common platform data elements for max8997 are parsed here from the
  * device tree. Other sub-modules of max8997 such as pmic, rtc and others have
@@ -164,24 +163,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
 
        return pd;
 }
-#else
-static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
-                                       struct device *dev)
-{
-       return 0;
-}
-#endif
 
 static inline int max8997_i2c_get_driver_data(struct i2c_client *i2c,
                                                const struct i2c_device_id *id)
 {
-#ifdef CONFIG_OF
-       if (i2c->dev.of_node) {
+       if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
                const struct of_device_id *match;
                match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
                return (int)match->data;
        }
-#endif
        return (int)id->driver_data;
 }
 
@@ -203,7 +193,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
        max8997->type = max8997_i2c_get_driver_data(i2c, id);
        max8997->irq = i2c->irq;
 
-       if (max8997->dev->of_node) {
+       if (IS_ENABLED(CONFIG_OF) && max8997->dev->of_node) {
                pdata = max8997_i2c_parse_dt_pdata(max8997->dev);
                if (IS_ERR(pdata))
                        return PTR_ERR(pdata);
@@ -228,18 +218,19 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
 
        max8997_irq_init(max8997);
 
-       mfd_add_devices(max8997->dev, -1, max8997_devs,
+       ret = mfd_add_devices(max8997->dev, -1, max8997_devs,
                        ARRAY_SIZE(max8997_devs),
                        NULL, 0, NULL);
+       if (ret < 0) {
+               dev_err(max8997->dev, "failed to add MFD devices %d\n", ret);
+               goto err_mfd;
+       }
 
        /*
         * TODO: enable others (flash, muic, rtc, battery, ...) and
         * check the return value
         */
 
-       if (ret < 0)
-               goto err_mfd;
-
        /* MAX8997 has a power button input. */
        device_init_wakeup(max8997->dev, pdata->wakeup);