linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Agner <stefan@agner.ch>
To: wg@grandegger.com, mkl@pengutronix.de
Cc: chripell@fsfe.org, linux-can@vger.kernel.org,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	stefan@agner.ch
Subject: [PATCH 2/2] can: mcp251x: get regulators optionally
Date: Mon, 18 May 2015 18:33:28 +0200	[thread overview]
Message-ID: <1431966808-26213-2-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1431966808-26213-1-git-send-email-stefan@agner.ch>

The regulators power and transceiver are optional. If those are not
present, the pointer (or error pointer) is correctly handled by the
driver, hence we can use devm_regulator_get_optional safely, which
avoids regulators getting created.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 drivers/net/can/spi/mcp251x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index 34c625e..117e78f 100644
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -1085,8 +1085,8 @@ static int mcp251x_can_probe(struct spi_device *spi)
 	if (ret)
 		goto out_clk;
 
-	priv->power = devm_regulator_get(&spi->dev, "vdd");
-	priv->transceiver = devm_regulator_get(&spi->dev, "xceiver");
+	priv->power = devm_regulator_get_optional(&spi->dev, "vdd");
+	priv->transceiver = devm_regulator_get_optional(&spi->dev, "xceiver");
 	if ((PTR_ERR(priv->power) == -EPROBE_DEFER) ||
 	    (PTR_ERR(priv->transceiver) == -EPROBE_DEFER)) {
 		ret = -EPROBE_DEFER;
-- 
2.4.1


  reply	other threads:[~2015-05-18 16:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-18 16:33 [PATCH 1/2] can: mcp251x: fix resume when device is down Stefan Agner
2015-05-18 16:33 ` Stefan Agner [this message]
2015-07-15 13:05 ` Stefan Agner
2015-07-15 13:15   ` Marc Kleine-Budde
2015-07-15 13:17     ` Stefan Agner
  -- strict thread matches above, loose matches on Subject: below --
2015-07-16  8:33 pull-request: can 2015-07-16 Marc Kleine-Budde
2015-07-16  8:33 ` [PATCH 2/2] can: mcp251x: get regulators optionally Marc Kleine-Budde

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=1431966808-26213-2-git-send-email-stefan@agner.ch \
    --to=stefan@agner.ch \
    --cc=chripell@fsfe.org \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    --cc=wg@grandegger.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).