From: "Simon Sandström" <simon@nikanor.nu>
To: gregkh@linuxfoundation.org
Cc: linux@Wolf-Entwicklungen.de, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] staging: pi433: Remove SET_CHECKED usage from pi433_probe
Date: Wed, 6 Dec 2017 21:42:24 +0100 [thread overview]
Message-ID: <20171206204224.14714-7-simon@nikanor.nu> (raw)
In-Reply-To: <20171206204224.14714-1-simon@nikanor.nu>
SET_CHECKED returns from the function on failure and in pi433_probe it is
necessary to free the GPIOs and the device on failure.
Signed-off-by: Simon Sandström <simon@nikanor.nu>
---
drivers/staging/pi433/pi433_if.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 688d0cf00782..55ed45f45998 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -1124,13 +1124,27 @@ static int pi433_probe(struct spi_device *spi)
}
/* setup the radio module */
- SET_CHECKED(rf69_set_mode (spi, standby));
- SET_CHECKED(rf69_set_data_mode (spi, DATAMODUL_MODE_PACKET));
- SET_CHECKED(rf69_enable_amplifier(spi, MASK_PALEVEL_PA0));
- SET_CHECKED(rf69_disable_amplifier(spi, MASK_PALEVEL_PA1));
- SET_CHECKED(rf69_disable_amplifier(spi, MASK_PALEVEL_PA2));
- SET_CHECKED(rf69_set_output_power_level (spi, 13));
- SET_CHECKED(rf69_set_antenna_impedance (spi, fiftyOhm));
+ retval = rf69_set_mode(spi, standby);
+ if (retval < 0)
+ goto minor_failed;
+ retval = rf69_set_data_mode(spi, DATAMODUL_MODE_PACKET);
+ if (retval < 0)
+ goto minor_failed;
+ retval = rf69_enable_amplifier(spi, MASK_PALEVEL_PA0);
+ if (retval < 0)
+ goto minor_failed;
+ retval = rf69_disable_amplifier(spi, MASK_PALEVEL_PA1);
+ if (retval < 0)
+ goto minor_failed;
+ retval = rf69_disable_amplifier(spi, MASK_PALEVEL_PA2);
+ if (retval < 0)
+ goto minor_failed;
+ retval = rf69_set_output_power_level(spi, 13);
+ if (retval < 0)
+ goto minor_failed;
+ retval = rf69_set_antenna_impedance(spi, fiftyOhm);
+ if (retval < 0)
+ goto minor_failed;
/* determ minor number */
retval = pi433_get_minor(device);
--
2.11.0
prev parent reply other threads:[~2017-12-06 20:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-06 20:42 [PATCH 0/6] staging: pi433: Minor cleanup and style fixes Simon Sandström
2017-12-06 20:42 ` [PATCH 1/6] staging: pi433: Split rf69_set_crc_enabled into two functions Simon Sandström
2017-12-07 14:38 ` Greg KH
2017-12-07 14:58 ` Simon Sandström
2017-12-07 16:52 ` Greg KH
2017-12-06 20:42 ` [PATCH 2/6] staging: pi433: Split rf69_set_sync_enabled " Simon Sandström
2017-12-06 20:42 ` [PATCH 3/6] staging: pi433: Remove enum data_mode Simon Sandström
2017-12-06 20:42 ` [PATCH 4/6] staging: pi433: Combine all rf69_set_amplifier_x() Simon Sandström
2017-12-06 20:42 ` [PATCH 5/6] staging: pi433: Move enum option_on_off to pi433_if.h Simon Sandström
2017-12-06 22:24 ` Marcus Wolf
2017-12-07 6:14 ` Greg KH
2017-12-06 20:42 ` Simon Sandström [this message]
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=20171206204224.14714-7-simon@nikanor.nu \
--to=simon@nikanor.nu \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@Wolf-Entwicklungen.de \
/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
all inboxes | Powered by JetHome®