From: Cyril Bur <cyrilbur@gmail.com>
To: linux-mtd@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
stewart@linux.vnet.ibm.com
Cc: dwmw2@infradead.org, computersforpeace@gmail.com,
boris.brezillon@free-electrons.com, sjitindarsingh@gmail.com
Subject: [PATCH v4 03/10] mtd: powernv_flash: Remove pointless goto in driver init
Date: Tue, 10 Oct 2017 14:32:55 +1100 [thread overview]
Message-ID: <20171010033302.20854-4-cyrilbur@gmail.com> (raw)
In-Reply-To: <20171010033302.20854-1-cyrilbur@gmail.com>
Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
---
drivers/mtd/devices/powernv_flash.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c
index ca3ca6adf71e..4dd3b5d2feb2 100644
--- a/drivers/mtd/devices/powernv_flash.c
+++ b/drivers/mtd/devices/powernv_flash.c
@@ -227,21 +227,20 @@ static int powernv_flash_probe(struct platform_device *pdev)
int ret;
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
- if (!data) {
- ret = -ENOMEM;
- goto out;
- }
+ if (!data)
+ return -ENOMEM;
+
data->mtd.priv = data;
ret = of_property_read_u32(dev->of_node, "ibm,opal-id", &(data->id));
if (ret) {
dev_err(dev, "no device property 'ibm,opal-id'\n");
- goto out;
+ return ret;
}
ret = powernv_flash_set_driver_info(dev, &data->mtd);
if (ret)
- goto out;
+ return ret;
dev_set_drvdata(dev, data);
@@ -250,10 +249,7 @@ static int powernv_flash_probe(struct platform_device *pdev)
* with an ffs partition at the start, it should prove easier for users
* to deal with partitions or not as they see fit
*/
- ret = mtd_device_register(&data->mtd, NULL, 0);
-
-out:
- return ret;
+ return mtd_device_register(&data->mtd, NULL, 0);
}
/**
--
2.14.2
next prev parent reply other threads:[~2017-10-10 3:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-10 3:32 [PATCH v4 00/10] Allow opal-async waiters to get interrupted Cyril Bur
2017-10-10 3:32 ` [PATCH v4 01/10] mtd: powernv_flash: Use WARN_ON_ONCE() rather than BUG_ON() Cyril Bur
2017-10-30 8:49 ` Boris Brezillon
2017-10-10 3:32 ` [PATCH v4 02/10] mtd: powernv_flash: Don't treat OPAL_SUCCESS as an error Cyril Bur
2017-10-30 8:50 ` Boris Brezillon
2017-10-10 3:32 ` Cyril Bur [this message]
2017-10-30 8:51 ` [PATCH v4 03/10] mtd: powernv_flash: Remove pointless goto in driver init Boris Brezillon
2017-10-10 3:32 ` [PATCH v4 04/10] mtd: powernv_flash: Don't return -ERESTARTSYS on interrupted token acquisition Cyril Bur
2017-10-30 8:51 ` Boris Brezillon
2017-10-10 3:32 ` [PATCH v4 05/10] powerpc/opal: Make __opal_async_{get, release}_token() static Cyril Bur
2017-10-10 3:32 ` [PATCH v4 06/10] powerpc/opal: Rework the opal-async interface Cyril Bur
2017-10-10 3:32 ` [PATCH v4 07/10] powernv/opal-sensor: remove not needed lock Cyril Bur
2017-10-10 3:33 ` [PATCH v4 08/10] powerpc/opal: Add opal_async_wait_response_interruptible() to opal-async Cyril Bur
2017-10-10 3:33 ` [PATCH v4 09/10] powerpc/powernv: Add OPAL_BUSY to opal_error_code() Cyril Bur
2017-10-10 3:33 ` [PATCH v4 10/10] mtd: powernv_flash: Use opal_async_wait_response_interruptible() Cyril Bur
2017-10-30 9:14 ` Boris Brezillon
2017-10-30 9:15 ` [PATCH v4 00/10] Allow opal-async waiters to get interrupted Boris Brezillon
2017-10-30 22:52 ` Cyril Bur
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=20171010033302.20854-4-cyrilbur@gmail.com \
--to=cyrilbur@gmail.com \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sjitindarsingh@gmail.com \
--cc=stewart@linux.vnet.ibm.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).