Merge tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging tree merge from Greg KH:
 "Here's the bit staging tree pull request for 3.12-rc1.

  Lots of staging driver updates, and fixes.  Lustre is finally enabled
  in the build, and lots of cleanup started happening in it.  There's a
  new wireless driver in here, and 2 new TTY drivers, which cause the
  overall lines added/removed to be quite large on the "added" side.

  The IIO driver updates are also coming through here, as they are tied
  to the staging iio drivers"

* tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (942 commits)
  staging: dwc2: make dwc2_core_params documentation more complete
  staging: dwc2: validate the value for phy_utmi_width
  staging: dwc2: interpret all hwcfg and related register at init time
  staging: dwc2: properly mask the GRXFSIZ register
  staging: dwc2: remove redundant register reads
  staging: dwc2: re-use hptxfsiz variable
  staging: dwc2: simplify debug output in dwc_hc_init
  staging: dwc2: add missing shift
  staging: dwc2: simplify register shift expressions
  staging: dwc2: only read the snpsid register once
  staging: dwc2: unshift non-bool register value constants
  staging: dwc2: fix off-by-one in check for max_packet_count parameter
  staging: dwc2: remove specific fifo size constants
  Staging:BCM:DDRInit.c:Renaming __FUNCTION__
  staging: bcm: remove Version.h file.
  staging: rtl8188eu: off by one in rtw_set_802_11_add_wep()
  staging: r8188eu: copying one byte too much
  staging: rtl8188eu: || vs && typo
  staging: r8188eu: off by one bugs
  staging: crystalhd: Resolve sparse 'different base types' warnings.
  ...

1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c
index 7a53f7d70dac..df7e028d9db5 100644
--- a/drivers/iio/dac/ad5764.c
+++ b/drivers/iio/dac/ad5764.c
@@ -275,7 +275,7 @@ static int ad5764_probe(struct spi_device *spi)
         struct ad5764_state *st;
         int ret;
 
-        indio_dev = iio_device_alloc(sizeof(*st));
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
         if (indio_dev == NULL) {
                 dev_err(&spi->dev, "Failed to allocate iio device\n");
                 return -ENOMEM;
@@ -298,12 +298,12 @@ static int ad5764_probe(struct spi_device *spi)
                 st->vref_reg[0].supply = "vrefAB";
                 st->vref_reg[1].supply = "vrefCD";
 
-                ret = regulator_bulk_get(&st->spi->dev,
+                ret = devm_regulator_bulk_get(&st->spi->dev,
                         ARRAY_SIZE(st->vref_reg), st->vref_reg);
                 if (ret) {
                         dev_err(&spi->dev, "Failed to request vref regulators: %d\n",
                                 ret);
-                        goto error_free;
+                        return ret;
                 }
 
                 ret = regulator_bulk_enable(ARRAY_SIZE(st->vref_reg),
@@ -311,7 +311,7 @@ static int ad5764_probe(struct spi_device *spi)
                 if (ret) {
                         dev_err(&spi->dev, "Failed to enable vref regulators: %d\n",
                                 ret);
-                        goto error_free_reg;
+                        return ret;
                 }
         }
 
@@ -326,12 +326,6 @@ static int ad5764_probe(struct spi_device *spi)
 error_disable_reg:
         if (st->chip_info->int_vref == 0)
                 regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg);
-error_free_reg:
-        if (st->chip_info->int_vref == 0)
-                regulator_bulk_free(ARRAY_SIZE(st->vref_reg), st->vref_reg);
-error_free:
-        iio_device_free(indio_dev);
-
         return ret;
 }
 
@@ -342,12 +336,8 @@ static int ad5764_remove(struct spi_device *spi)
 
         iio_device_unregister(indio_dev);
 
-        if (st->chip_info->int_vref == 0) {
+        if (st->chip_info->int_vref == 0)
                 regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg);
-                regulator_bulk_free(ARRAY_SIZE(st->vref_reg), st->vref_reg);
-        }
-
-        iio_device_free(indio_dev);
 
         return 0;
 }