netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Clément Perrochaud" <clement.perrochaud@effinnov.com>,
	"Charles Gorand" <charles.gorand@effinnov.com>,
	netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
	"Sedat Dilek" <sedat.dilek@credativ.de>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Sedat Dilek <sedat.dilek@gmail.com>
Subject: [PATCH v3 07/14] NFC: nxp-nci: Get rid of useless label
Date: Thu, 25 Jul 2019 22:35:04 +0300	[thread overview]
Message-ID: <20190725193511.64274-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20190725193511.64274-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>
Tested-by: Sedat Dilek <sedat.dilek@gmail.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 6a627d1b6f85..bec9b1ea78e2 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -265,16 +265,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);
@@ -298,7 +295,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,
@@ -307,7 +304,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


  parent reply	other threads:[~2019-07-25 19:35 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-25 19:34 [PATCH v3 01/14] NFC: fix attrs checks in netlink interface Andy Shevchenko
2019-07-25 19:34 ` [PATCH v3 02/14] NFC: nxp-nci: Add NXP1001 to the ACPI ID table Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 03/14] NFC: nxp-nci: Get rid of platform data Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 04/14] NFC: nxp-nci: Convert to use GPIO descriptor Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 05/14] NFC: nxp-nci: Add GPIO ACPI mapping table Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 06/14] NFC: nxp-nci: Get rid of code duplication in ->probe() Andy Shevchenko
2019-07-25 19:35 ` Andy Shevchenko [this message]
2019-07-25 19:35 ` [PATCH v3 08/14] NFC: nxp-nci: Constify acpi_device_id Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 09/14] NFC: nxp-nci: Drop of_match_ptr() use Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 10/14] NFC: nxp-nci: Drop comma in terminator lines Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 11/14] NFC: nxp-nci: Remove unused macro pr_fmt() Andy Shevchenko
2019-07-26 21:23   ` David Miller
2019-07-29  9:40     ` Andy Shevchenko
2019-07-29 14:58       ` Sedat Dilek
2019-07-29 15:08         ` Sedat Dilek
2019-07-25 19:35 ` [PATCH v3 12/14] NFC: nxp-nci: Remove 'default n' for the core Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 13/14] NFC: nxp-nci: Clarify on supported chips Andy Shevchenko
2019-07-25 19:35 ` [PATCH v3 14/14] NFC: nxp-nci: Fix recommendation for NFC_NXP_NCI_I2C Kconfig Andy Shevchenko
2019-07-26  8:54 ` [PATCH v3 01/14] NFC: fix attrs checks in netlink interface Sedat Dilek
2019-07-26 11:44   ` Andy Shevchenko

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=20190725193511.64274-7-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=charles.gorand@effinnov.com \
    --cc=clement.perrochaud@effinnov.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=sedat.dilek@credativ.de \
    --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).