From: Renato Lui Geh <renatogeh@gmail.com> To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, stefan.popa@analog.com, alexandru.Ardelean@analog.com, giuliano.belinassi@usp.br, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com, devicetree@vger.kernel.org Subject: [PATCH v4 5/9] staging: iio: ad7780: move regulator to after GPIO init Date: Thu, 28 Feb 2019 11:25:09 -0300 [thread overview] Message-ID: <93cabb081605ac356f2f0d9a9a41d5bc5e63820d.1551358569.git.renatogeh@gmail.com> (raw) In-Reply-To: <cover.1551358569.git.renatogeh@gmail.com> To maintain consistency between ad7780_probe and ad7780_remove orders, regulator initialization has been moved to after GPIO initializations. Signed-off-by: Renato Lui Geh <renatogeh@gmail.com> --- drivers/staging/iio/adc/ad7780.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index ad7617a3a141..12aef0f101bc 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -255,16 +255,6 @@ static int ad7780_probe(struct spi_device *spi) ad_sd_init(&st->sd, indio_dev, spi, &ad7780_sigma_delta_info); - st->reg = devm_regulator_get(&spi->dev, "avdd"); - if (IS_ERR(st->reg)) - return PTR_ERR(st->reg); - - ret = regulator_enable(st->reg); - if (ret) { - dev_err(&spi->dev, "Failed to enable specified AVdd supply\n"); - return ret; - } - st->chip_info = &ad7780_chip_info_tbl[spi_get_device_id(spi)->driver_data]; @@ -284,7 +274,7 @@ static int ad7780_probe(struct spi_device *spi) ret = PTR_ERR(st->powerdown_gpio); dev_err(&spi->dev, "Failed to request powerdown GPIO: %d\n", ret); - goto error_disable_reg; + return ret; } if (st->chip_info->is_ad778x) { @@ -295,7 +285,7 @@ static int ad7780_probe(struct spi_device *spi) ret = PTR_ERR(st->gain_gpio); dev_err(&spi->dev, "Failed to request gain GPIO: %d\n", ret); - goto error_disable_reg; + return ret; } st->filter_gpio = devm_gpiod_get_optional(&spi->dev, @@ -306,10 +296,20 @@ static int ad7780_probe(struct spi_device *spi) dev_err(&spi->dev, "Failed to request filter GPIO: %d\n", ret); - goto error_disable_reg; + return ret; } } + st->reg = devm_regulator_get(&spi->dev, "avdd"); + if (IS_ERR(st->reg)) + return PTR_ERR(st->reg); + + ret = regulator_enable(st->reg); + if (ret) { + dev_err(&spi->dev, "Failed to enable specified AVdd supply\n"); + return ret; + } + ret = ad_sd_setup_buffer_and_trigger(indio_dev); if (ret) goto error_disable_reg; -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Renato Lui Geh <renatogeh@gmail.com> To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, stefan.popa@analog.com, alexandru.Ardelean@analog.com, giuliano.belinassi@usp.br, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com Subject: [PATCH v4 5/9] staging: iio: ad7780: move regulator to after GPIO init Date: Thu, 28 Feb 2019 11:25:09 -0300 [thread overview] Message-ID: <93cabb081605ac356f2f0d9a9a41d5bc5e63820d.1551358569.git.renatogeh@gmail.com> (raw) In-Reply-To: <cover.1551358569.git.renatogeh@gmail.com> To maintain consistency between ad7780_probe and ad7780_remove orders, regulator initialization has been moved to after GPIO initializations. Signed-off-by: Renato Lui Geh <renatogeh@gmail.com> --- drivers/staging/iio/adc/ad7780.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index ad7617a3a141..12aef0f101bc 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -255,16 +255,6 @@ static int ad7780_probe(struct spi_device *spi) ad_sd_init(&st->sd, indio_dev, spi, &ad7780_sigma_delta_info); - st->reg = devm_regulator_get(&spi->dev, "avdd"); - if (IS_ERR(st->reg)) - return PTR_ERR(st->reg); - - ret = regulator_enable(st->reg); - if (ret) { - dev_err(&spi->dev, "Failed to enable specified AVdd supply\n"); - return ret; - } - st->chip_info = &ad7780_chip_info_tbl[spi_get_device_id(spi)->driver_data]; @@ -284,7 +274,7 @@ static int ad7780_probe(struct spi_device *spi) ret = PTR_ERR(st->powerdown_gpio); dev_err(&spi->dev, "Failed to request powerdown GPIO: %d\n", ret); - goto error_disable_reg; + return ret; } if (st->chip_info->is_ad778x) { @@ -295,7 +285,7 @@ static int ad7780_probe(struct spi_device *spi) ret = PTR_ERR(st->gain_gpio); dev_err(&spi->dev, "Failed to request gain GPIO: %d\n", ret); - goto error_disable_reg; + return ret; } st->filter_gpio = devm_gpiod_get_optional(&spi->dev, @@ -306,10 +296,20 @@ static int ad7780_probe(struct spi_device *spi) dev_err(&spi->dev, "Failed to request filter GPIO: %d\n", ret); - goto error_disable_reg; + return ret; } } + st->reg = devm_regulator_get(&spi->dev, "avdd"); + if (IS_ERR(st->reg)) + return PTR_ERR(st->reg); + + ret = regulator_enable(st->reg); + if (ret) { + dev_err(&spi->dev, "Failed to enable specified AVdd supply\n"); + return ret; + } + ret = ad_sd_setup_buffer_and_trigger(indio_dev); if (ret) goto error_disable_reg; -- 2.21.0
next prev parent reply other threads:[~2019-02-28 14:25 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-28 14:23 [PATCH v4 0/9] staging: iio: ad7780: move out of staging Renato Lui Geh 2019-02-28 14:23 ` [PATCH v4 1/9] staging: iio: ad7780: add gain & filter gpio support Renato Lui Geh 2019-03-01 6:56 ` Ardelean, Alexandru 2019-03-01 7:42 ` Dan Carpenter 2019-03-01 7:42 ` Dan Carpenter 2019-03-02 19:03 ` Jonathan Cameron 2019-02-28 14:24 ` [PATCH v4 2/9] staging: iio: ad7780: add filter reading to ad778x Renato Lui Geh 2019-03-01 6:59 ` Ardelean, Alexandru 2019-02-28 14:24 ` [PATCH v4 3/9] staging: iio: ad7780: set pattern values and masks directly Renato Lui Geh 2019-03-01 7:17 ` Ardelean, Alexandru 2019-03-02 19:07 ` Jonathan Cameron 2019-03-02 19:08 ` Jonathan Cameron 2019-03-04 7:19 ` Ardelean, Alexandru 2019-02-28 14:24 ` [PATCH v4 4/9] staging:iio:ad7780: add chip ID values and mask Renato Lui Geh 2019-02-28 14:24 ` Renato Lui Geh 2019-03-01 7:20 ` Ardelean, Alexandru 2019-03-03 14:01 ` Renato Lui Geh 2019-03-03 14:01 ` Renato Lui Geh 2019-03-03 14:53 ` Jonathan Cameron 2019-03-03 14:53 ` Jonathan Cameron 2019-03-04 7:33 ` Ardelean, Alexandru 2019-03-09 0:19 ` Renato Lui Geh 2019-03-09 0:19 ` Renato Lui Geh 2019-03-09 17:47 ` Jonathan Cameron 2019-03-09 17:47 ` Jonathan Cameron 2019-02-28 14:25 ` Renato Lui Geh [this message] 2019-02-28 14:25 ` [PATCH v4 5/9] staging: iio: ad7780: move regulator to after GPIO init Renato Lui Geh 2019-03-01 7:38 ` Ardelean, Alexandru 2019-03-02 19:11 ` Jonathan Cameron 2019-03-04 7:20 ` Ardelean, Alexandru 2019-02-28 14:25 ` [PATCH v4 6/9] staging: iio: ad7780: add SPDX identifier Renato Lui Geh 2019-02-28 14:25 ` Renato Lui Geh 2019-02-28 14:25 ` [PATCH v4 7/9] staging: iio: ad7780: add new copyright holder Renato Lui Geh 2019-02-28 14:26 ` [PATCH v4 8/9] staging: iio: ad7780: moving ad7780 out of staging Renato Lui Geh 2019-03-02 19:17 ` Jonathan Cameron 2019-02-28 14:26 ` [PATCH v4 9/9] staging: iio: ad7780: add device tree binding Renato Lui Geh 2019-03-02 19:13 ` Jonathan Cameron 2019-03-11 22:47 ` Rob Herring 2019-03-01 8:35 ` [PATCH v4 0/9] staging: iio: ad7780: move out of staging Ardelean, Alexandru 2019-03-01 8:35 ` Ardelean, Alexandru 2019-03-03 13:52 ` Renato Lui Geh 2019-03-03 13:52 ` Renato Lui Geh 2019-03-03 14:32 ` Alexandru Ardelean 2019-03-03 14:32 ` Alexandru Ardelean
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=93cabb081605ac356f2f0d9a9a41d5bc5e63820d.1551358569.git.renatogeh@gmail.com \ --to=renatogeh@gmail.com \ --cc=Michael.Hennerich@analog.com \ --cc=alexandru.Ardelean@analog.com \ --cc=devel@driverdev.osuosl.org \ --cc=devicetree@vger.kernel.org \ --cc=giuliano.belinassi@usp.br \ --cc=gregkh@linuxfoundation.org \ --cc=jic23@kernel.org \ --cc=kernel-usp@googlegroups.com \ --cc=knaack.h@gmx.de \ --cc=lars@metafoo.de \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=pmeerw@pmeerw.net \ --cc=robh+dt@kernel.org \ --cc=stefan.popa@analog.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.