From: willy@linux.intel.com (Matthew Wilcox)
Subject: [PATCH] NVMe: Remove dead code in nvme_dev_add
Date: Wed, 1 May 2013 16:30:27 -0400 [thread overview]
Message-ID: <20130501203027.GC6057@linux.intel.com> (raw)
In-Reply-To: <1367435271-15784-3-git-send-email-keith.busch@intel.com>
On Wed, May 01, 2013@01:07:49PM -0600, Keith Busch wrote:
> There is no situation that could occur where we could error out of this
> function and require cleaning up allocated namespaces.
I'd rather the exit label were called 'out' than 'out_free' at the end
of this patch.
> Signed-off-by: Keith Busch <keith.busch at intel.com>
> ---
> drivers/block/nvme-core.c | 9 +--------
> 1 files changed, 1 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index e7d68e3..82a5f81 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -1511,7 +1511,7 @@ static void nvme_free_queues(struct nvme_dev *dev)
> static int nvme_dev_add(struct nvme_dev *dev)
> {
> int res, nn, i;
> - struct nvme_ns *ns, *next;
> + struct nvme_ns *ns;
> struct nvme_id_ctrl *ctrl;
> struct nvme_id_ns *id_ns;
> void *mem;
> @@ -1564,15 +1564,8 @@ static int nvme_dev_add(struct nvme_dev *dev)
> list_for_each_entry(ns, &dev->namespaces, list)
> add_disk(ns->disk);
> res = 0;
> - goto out;
>
> out_free:
> - list_for_each_entry_safe(ns, next, &dev->namespaces, list) {
> - list_del(&ns->list);
> - nvme_ns_free(ns);
> - }
> -
> - out:
> dma_free_coherent(&dev->pci_dev->dev, 8192, mem, dma_addr);
> return res;
> }
> --
> 1.7.0.4
>
>
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://merlin.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2013-05-01 20:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 19:07 [PATCH] NVMe: Fix error clean-up on nvme_alloc_queue Keith Busch
2013-05-01 19:07 ` [PATCH] NVMe: Check for NULL memory in nvme_dev_add Keith Busch
2013-05-01 19:07 ` [PATCH] NVMe: Remove dead code " Keith Busch
2013-05-01 20:30 ` Matthew Wilcox [this message]
2013-05-01 19:07 ` [PATCH] NVMe: Free allocated memory in probe failure Keith Busch
2013-05-01 19:49 ` Matthew Wilcox
2013-05-01 19:07 ` [PATCH] NVMe: Free admin queue on request_irq error Keith Busch
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=20130501203027.GC6057@linux.intel.com \
--to=willy@linux.intel.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).