From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Clément Perrochaud" <clement.perrochaud@effinnov.com>,
"Charles Gorand" <charles.gorand@effinnov.com>,
linux-nfc@lists.01.org, "Samuel Ortiz" <sameo@linux.intel.com>,
linux-wireless@vger.kernel.org,
"Sedat Dilek" <sedat.dilek@gmail.com>,
"Oleg Zhurakivskyy" <oleg.zhurakivskyy@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 06/12] NFC: nxp-nci: Get rid of useless label
Date: Mon, 13 May 2019 13:43:52 +0300 [thread overview]
Message-ID: <20190513104358.59716-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20190513104358.59716-1-andriy.shevchenko@linux.intel.com>
Return directly in ->probe() since there no special cleaning is needed.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/nfc/nxp-nci/i2c.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index 9eeb59d1199a..6379f2198524 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -276,16 +276,13 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
nfc_err(&client->dev, "Need I2C_FUNC_I2C\n");
- r = -ENODEV;
- goto probe_exit;
+ return -ENODEV;
}
phy = devm_kzalloc(&client->dev, sizeof(struct nxp_nci_i2c_phy),
GFP_KERNEL);
- if (!phy) {
- r = -ENOMEM;
- goto probe_exit;
- }
+ if (!phy)
+ return -ENOMEM;
phy->i2c_dev = client;
i2c_set_clientdata(client, phy);
@@ -309,7 +306,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,
r = nxp_nci_probe(phy, &client->dev, &i2c_phy_ops,
NXP_NCI_I2C_MAX_PAYLOAD, &phy->ndev);
if (r < 0)
- goto probe_exit;
+ return r;
r = request_threaded_irq(client->irq, NULL,
nxp_nci_i2c_irq_thread_fn,
@@ -318,7 +315,6 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,
if (r < 0)
nfc_err(&client->dev, "Unable to register IRQ handler\n");
-probe_exit:
return r;
}
--
2.20.1
next prev parent reply other threads:[~2019-05-13 10:44 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-13 10:43 [PATCH v2 00/12] NFC: nxp-nci: clean up and support new ID Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 01/12] NFC: nxp-nci: Add NXP1001 to the ACPI ID table Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 02/12] NFC: nxp-nci: Get rid of platform data Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 03/12] NFC: nxp-nci: Convert to use GPIO descriptor Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 04/12] NFC: nxp-nci: Add GPIO ACPI mapping table Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 05/12] NFC: nxp-nci: Get rid of code duplication in ->probe() Andy Shevchenko
2019-05-13 10:43 ` Andy Shevchenko [this message]
2019-05-13 10:43 ` [PATCH v2 07/12] NFC: nxp-nci: Constify acpi_device_id Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 08/12] NFC: nxp-nci: Drop of_match_ptr() use Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 09/12] NFC: nxp-nci: Drop comma in terminator lines Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 10/12] NFC: nxp-nci: Remove unused macro pr_fmt() Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 11/12] NFC: nxp-nci: Remove 'default n' for tests Andy Shevchenko
2019-05-13 10:43 ` [PATCH v2 12/12] NFC: nxp-nci: Convert to SPDX license tags Andy Shevchenko
2019-05-13 11:43 ` [PATCH v2 00/12] NFC: nxp-nci: clean up and support new ID Sedat Dilek
2019-05-13 11:46 ` Sedat Dilek
2019-05-13 12:49 ` Oleg Zhurakivskyy
2019-05-13 12:56 ` Andy Shevchenko
2019-05-13 12:18 ` Sedat Dilek
2019-05-13 12:37 ` Andy Shevchenko
2019-05-14 8:34 ` Sedat Dilek
2019-05-14 11:44 ` Oleg Zhurakivskyy
2019-05-14 12:03 ` Sedat Dilek
2019-05-14 13:30 ` Oleg Zhurakivskyy
2019-05-14 13:44 ` Sedat Dilek
2019-05-14 13:56 ` Oleg Zhurakivskyy
2019-05-14 14:53 ` Sedat Dilek
2019-05-14 17:01 ` Andy Shevchenko
2019-05-15 8:32 ` Sedat Dilek
2019-05-15 10:09 ` Andy Shevchenko
2019-05-15 10:22 ` Sedat Dilek
2019-05-13 19:48 ` Sedat Dilek
2019-05-14 10:03 ` Andy Shevchenko
2019-05-14 12:12 ` Sedat Dilek
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=20190513104358.59716-7-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=charles.gorand@effinnov.com \
--cc=clement.perrochaud@effinnov.com \
--cc=linux-nfc@lists.01.org \
--cc=linux-wireless@vger.kernel.org \
--cc=oleg.zhurakivskyy@intel.com \
--cc=sameo@linux.intel.com \
--cc=sedat.dilek@gmail.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).