From: nsekhar@ti•com (Sekhar Nori)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 2/5] mmc: davinci: fix unwinding in probe
Date: Tue, 15 Mar 2016 14:40:48 +0530 [thread overview]
Message-ID: <56E7D198.4050900@ti.com> (raw)
In-Reply-To: <1457996081-21975-3-git-send-email-david@lechnology.com>
On Tuesday 15 March 2016 04:24 AM, David Lechner wrote:
> Unwiding from an error in davinci_mmcsd_probe was a mess. Some errors were
> not handled and not all paths unwound correctly. Also using devm_ where
> possible to simplify things.
>
> Signed-off-by: David Lechner <david@lechnology•com>
> ---
>
> v2 changes: use devm_ where possible
>
> drivers/mmc/host/davinci_mmc.c | 93 ++++++++++++++++--------------------------
> 1 file changed, 35 insertions(+), 58 deletions(-)
>
> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
> index a294d261..6dd9562 100644
> --- a/drivers/mmc/host/davinci_mmc.c
> +++ b/drivers/mmc/host/davinci_mmc.c
> @@ -1223,7 +1223,7 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
> struct mmc_davinci_host *host = NULL;
> struct mmc_host *mmc = NULL;
> struct resource *r, *mem = NULL;
> - int ret = 0, irq = 0;
> + int ret, irq;
> size_t mem_size;
> const struct platform_device_id *id_entry;
>
> @@ -1233,22 +1233,20 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
> return -ENOENT;
> }
>
> - ret = -ENODEV;
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> irq = platform_get_irq(pdev, 0);
> if (!r || irq == NO_IRQ)
> - goto out;
> + return -ENODEV;
>
> - ret = -EBUSY;
> mem_size = resource_size(r);
> - mem = request_mem_region(r->start, mem_size, pdev->name);
> + mem = devm_request_mem_region(&pdev->dev, r->start, mem_size,
> + pdev->name);
> if (!mem)
> - goto out;
> + return -EBUSY;
>
> - ret = -ENOMEM;
> mmc = mmc_alloc_host(sizeof(struct mmc_davinci_host), &pdev->dev);
> if (!mmc)
> - goto out;
> + ret = -ENOMEM;
This should be 'return -ENOMEM' you dont want to proceed further if this
fails.
Other than that, looks fine to me.
Regards,
Sekhar
next prev parent reply other threads:[~2016-03-15 9:10 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 23:50 [PATCH 0/4] davinci_mmc device tree fixes David Lechner
2016-03-09 23:50 ` [PATCH 1/4] mmc: davinci: remove matching string David Lechner
2016-03-14 13:41 ` Sekhar Nori
2016-03-09 23:50 ` [PATCH 2/4] mmc: davinci: fix unwinding in probe David Lechner
2016-03-14 11:52 ` Sekhar Nori
2016-03-09 23:50 ` [PATCH 3/4] mmc: davinci: prepare clock David Lechner
2016-03-14 11:54 ` Sekhar Nori
2016-03-14 17:09 ` David Lechner
2016-03-14 17:13 ` David Lechner
2016-03-15 5:16 ` Sekhar Nori
2016-03-09 23:50 ` [PATCH 4/4] mmc: davinci: suppress waring when using DT David Lechner
2016-03-14 13:41 ` Sekhar Nori
2016-03-14 22:54 ` [PATCH v2 0/5] davinci_mmc fixes David Lechner
2016-03-14 22:54 ` [PATCH v2 1/5] mmc: davinci: remove matching string David Lechner
2016-03-15 9:12 ` Sekhar Nori
2016-03-14 22:54 ` [PATCH v2 2/5] mmc: davinci: fix unwinding in probe David Lechner
2016-03-15 9:10 ` Sekhar Nori [this message]
2016-03-14 22:54 ` [PATCH v2 3/5] mmc: davinci: prepare clock David Lechner
2016-03-15 9:13 ` Sekhar Nori
2016-03-14 22:54 ` [PATCH v2 4/5] mmc: davinci: don't use dma platform resources David Lechner
2016-03-15 8:09 ` Sekhar Nori
2016-03-15 8:54 ` Peter Ujfalusi
2016-03-15 8:56 ` Peter Ujfalusi
2016-03-15 17:14 ` David Lechner
2016-03-16 8:46 ` Peter Ujfalusi
2016-03-14 22:54 ` [PATCH v2 5/5] arm: davinci: remove mmc dma resources David Lechner
2016-03-15 8:23 ` Sekhar Nori
2016-03-15 8:13 ` [PATCH v2 0/5] davinci_mmc fixes Sekhar Nori
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=56E7D198.4050900@ti.com \
--to=nsekhar@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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