removed queue-3.10/iio-max1363-use-devm_regulator_get_optional-for-optional-regulator...

diff --git a/queue-3.10/iio-max1363-use-devm_regulator_get_optional-for-optional-regulator.patch b/queue-3.10/iio-max1363-use-devm_regulator_get_optional-for-optional-regulator.patch
deleted file mode 100644 (file)
index cb85623..0000000
--- a/queue-3.10/iio-max1363-use-devm_regulator_get_optional-for-optional-regulator.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 55b40d37311807a6bb2acdae0df904f54a0da3ae Mon Sep 17 00:00:00 2001
-From: Guenter Roeck <linux@roeck-us.net>
-Date: Mon, 27 Jan 2014 18:10:00 +0000
-Subject: iio: max1363: Use devm_regulator_get_optional for optional regulator
-
-From: Guenter Roeck <linux@roeck-us.net>
-
-commit 55b40d37311807a6bb2acdae0df904f54a0da3ae upstream.
-
-In kernel version 3.13, devm_regulator_get() may return no error
-if a regulator is undeclared. regulator_get_voltage() will return
--EINVAL if this happens. This causes the driver to fail loading if
-the vref regulator is not declared.
-
-Since vref is optional, call devm_regulator_get_optional instead.
-
-Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/iio/adc/max1363.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/iio/adc/max1363.c
-+++ b/drivers/iio/adc/max1363.c
-@@ -1528,7 +1528,7 @@ static int max1363_probe(struct i2c_clie
-       st->client = client;
- 
-       st->vref_uv = st->chip_info->int_vref_mv * 1000;
--      vref = devm_regulator_get(&client->dev, "vref");
-+      vref = devm_regulator_get_optional(&client->dev, "vref");
-       if (!IS_ERR(vref)) {
-               int vref_uv;
- 

diff --git a/queue-3.10/series b/queue-3.10/series
index a4f443773295fb3d3f7134e22b933b80112bd49e..81670a14845975aaf0287ffae5f8c919217ba2f7 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -29,7 +29,6 @@ vt-fix-secure-clear-screen.patch
 usb-qcserial-add-netgear-aircard-340u.patch
 staging-comedi-adv_pci1710-fix-analog-output-readback-value.patch
 staging-iio-ad799x-fix-error_free_irq-which-was-freeing-an-irq-that-may-not-have-been-requested.patch
-iio-max1363-use-devm_regulator_get_optional-for-optional-regulator.patch
 iio-adis16400-set-timestamp-as-the-last-element-in-chan_spec.patch
 x86-smap-don-t-enable-smap-if-config_x86_smap-is-disabled.patch
 x86-smap-smap_violation-is-bogus-if-config_x86_smap-is-off.patch