Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

Pull MFD update from Samuel Ortiz:
 "For 3.10 we have a few new MFD drivers for:

   - The ChromeOS embedded controller which provides keyboard, battery
     and power management services.  This controller is accessible
     through i2c or SPI.

   - Silicon Laboratories 476x controller, providing access to their FM
     chipset and their audio codec.

   - Realtek's RTS5249, a memory stick, MMC and SD/SDIO PCI based
     reader.

   - Nokia's Tahvo power button and watchdog device.  This device is
     very similar to Retu and is thus supported by the same code base.

   - STMicroelectronics STMPE1801, a keyboard and GPIO controller
     supported by the stmpe driver.

   - ST-Ericsson AB8540 and AB8505 power management and voltage
     converter controllers through the existing ab8500 code.

  Some other drivers got cleaned up or improved.  In particular:

   - The Linaro/STE guys got the ab8500 driver in sync with their
     internal code through a series of optimizations, fixes and
     improvements.

   - The AS3711 and OMAP USB drivers now have DT support.

   - The arizona clock and interrupt handling code got improved.

   - The wm5102 register patch and boot mechanism also got improved."

* tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (104 commits)
  mfd: si476x: Don't use 0bNNN
  mfd: vexpress: Handle pending config transactions
  mfd: ab8500: Export ab8500_gpadc_sw_hw_convert properly
  mfd: si476x: Fix i2c warning
  mfd: si476x: Add header files and Kbuild plumbing
  mfd: si476x: Add chip properties handling code
  mfd: si476x: Add the bulk of the core driver
  mfd: si476x: Add commands abstraction layer
  mfd: rtsx: Support RTS5249
  mfd: retu: Add Tahvo support
  mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
  mfd: wm8994: Add some OF properties
  mfd: wm8994: Add device ID data to WM8994 OF device IDs
  input: Export matrix_keypad_parse_of_params()
  mfd: tps65090: Add compatible string for charger subnode
  mfd: db8500-prcmu: Support platform dependant device selection
  mfd: syscon: Fix warnings when printing resource_size_t
  of: Add stub of_get_parent for non-OF builds
  mfd: omap-usb-tll: Convert to devm_ioremap_resource()
  mfd: omap-usb-host: Convert to devm_ioremap_resource()
  ...

1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index ecc092c7f745..4cb92bb2aea2 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -350,7 +350,8 @@ static int tc3589x_probe(struct i2c_client *i2c,
                                      | I2C_FUNC_SMBUS_I2C_BLOCK))
                 return -EIO;
 
-        tc3589x = kzalloc(sizeof(struct tc3589x), GFP_KERNEL);
+        tc3589x = devm_kzalloc(&i2c->dev, sizeof(struct tc3589x),
+                                GFP_KERNEL);
         if (!tc3589x)
                 return -ENOMEM;
 
@@ -366,33 +367,27 @@ static int tc3589x_probe(struct i2c_client *i2c,
 
         ret = tc3589x_chip_init(tc3589x);
         if (ret)
-                goto out_free;
+                return ret;
 
         ret = tc3589x_irq_init(tc3589x, np);
         if (ret)
-                goto out_free;
+                return ret;
 
         ret = request_threaded_irq(tc3589x->i2c->irq, NULL, tc3589x_irq,
                                    IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                                    "tc3589x", tc3589x);
         if (ret) {
                 dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret);
-                goto out_free;
+                return ret;
         }
 
         ret = tc3589x_device_init(tc3589x);
         if (ret) {
                 dev_err(tc3589x->dev, "failed to add child devices\n");
-                goto out_freeirq;
+                return ret;
         }
 
         return 0;
-
-out_freeirq:
-        free_irq(tc3589x->i2c->irq, tc3589x);
-out_free:
-        kfree(tc3589x);
-        return ret;
 }
 
 static int tc3589x_remove(struct i2c_client *client)
@@ -401,10 +396,6 @@ static int tc3589x_remove(struct i2c_client *client)
 
         mfd_remove_devices(tc3589x->dev);
 
-        free_irq(tc3589x->i2c->irq, tc3589x);
-
-        kfree(tc3589x);
-
         return 0;
 }