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, 9 insertions, 26 deletions

diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index 97c1e5d780df..ce7458963309 100644
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -349,17 +349,15 @@ static int ad5791_probe(struct spi_device *spi)
         struct ad5791_state *st;
         int ret, pos_voltage_uv = 0, neg_voltage_uv = 0;
 
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
         st = iio_priv(indio_dev);
-        st->reg_vdd = regulator_get(&spi->dev, "vdd");
+        st->reg_vdd = devm_regulator_get(&spi->dev, "vdd");
         if (!IS_ERR(st->reg_vdd)) {
                 ret = regulator_enable(st->reg_vdd);
                 if (ret)
-                        goto error_put_reg_pos;
+                        return ret;
 
                 ret = regulator_get_voltage(st->reg_vdd);
                 if (ret < 0)
@@ -368,11 +366,11 @@ static int ad5791_probe(struct spi_device *spi)
                 pos_voltage_uv = ret;
         }
 
-        st->reg_vss = regulator_get(&spi->dev, "vss");
+        st->reg_vss = devm_regulator_get(&spi->dev, "vss");
         if (!IS_ERR(st->reg_vss)) {
                 ret = regulator_enable(st->reg_vss);
                 if (ret)
-                        goto error_put_reg_neg;
+                        goto error_disable_reg_pos;
 
                 ret = regulator_get_voltage(st->reg_vss);
                 if (ret < 0)
@@ -428,19 +426,9 @@ static int ad5791_probe(struct spi_device *spi)
 error_disable_reg_neg:
         if (!IS_ERR(st->reg_vss))
                 regulator_disable(st->reg_vss);
-error_put_reg_neg:
-        if (!IS_ERR(st->reg_vss))
-                regulator_put(st->reg_vss);
-
 error_disable_reg_pos:
         if (!IS_ERR(st->reg_vdd))
                 regulator_disable(st->reg_vdd);
-error_put_reg_pos:
-        if (!IS_ERR(st->reg_vdd))
-                regulator_put(st->reg_vdd);
-        iio_device_free(indio_dev);
-error_ret:
-
         return ret;
 }
 
@@ -450,16 +438,11 @@ static int ad5791_remove(struct spi_device *spi)
         struct ad5791_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        if (!IS_ERR(st->reg_vdd)) {
+        if (!IS_ERR(st->reg_vdd))
                 regulator_disable(st->reg_vdd);
-                regulator_put(st->reg_vdd);
-        }
 
-        if (!IS_ERR(st->reg_vss)) {
+        if (!IS_ERR(st->reg_vss))
                 regulator_disable(st->reg_vss);
-                regulator_put(st->reg_vss);
-        }
-        iio_device_free(indio_dev);
 
         return 0;
 }