From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/5] mci: Always add probe parameter for cards
Date: Sun, 20 Jan 2013 10:58:40 +0100 [thread overview]
Message-ID: <1358675923-13628-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1358675923-13628-1-git-send-email-s.hauer@pengutronix.de>
Always add the 'probe' parameter to cards so that scripts can
rely on the parameter to be present.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mci/mci-core.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 711f74b..7d43fe3 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -1499,34 +1499,18 @@ static int mci_probe(struct device_d *mci_dev)
dev_info(mci->host->hw_dev, "registered as %s\n", dev_name(mci_dev));
-#ifdef CONFIG_MCI_STARTUP
- /* if enabled, probe the attached card immediately */
- rc = mci_card_probe(mci);
- if (rc) {
- /*
- * If it fails, add the 'probe' parameter to give the user
- * a chance to insert a card and try again. Note: This may fail
- * systems that rely on the MCI card for startup (for the
- * persistant environment for example)
- */
- rc = add_mci_parameter(mci_dev);
- if (rc != 0) {
- dev_dbg(mci->mci_dev, "Failed to add 'probe' parameter to the MCI device\n");
- goto on_error;
- }
- }
-#endif
-
-#ifndef CONFIG_MCI_STARTUP
- /* add params on demand */
rc = add_mci_parameter(mci_dev);
if (rc != 0) {
dev_dbg(mci->mci_dev, "Failed to add 'probe' parameter to the MCI device\n");
goto on_error;
}
+
+#ifdef CONFIG_MCI_STARTUP
+ /* if enabled, probe the attached card immediately */
+ mci_card_probe(mci);
#endif
- return rc;
+ return 0;
on_error:
free(mci);
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-01-20 9:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 9:58 [PATCH] MMC/SD improvements Sascha Hauer
2013-01-20 9:58 ` [PATCH 1/5] mci: return 0 for probe parameter even when already initialized Sascha Hauer
2013-01-20 9:58 ` Sascha Hauer [this message]
2013-01-20 9:58 ` [PATCH 3/5] mci: Add card_present callback Sascha Hauer
2013-01-20 9:58 ` [PATCH 4/5] mci i.MX esdhc: implement " Sascha Hauer
2013-01-20 9:58 ` [PATCH 5/5] mci atmel: " Sascha Hauer
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=1358675923-13628-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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