From: Sascha Hauer <s.hauer@pengutronix.de>
To: "open list:BAREBOX" <barebox@lists.infradead.org>
Subject: [PATCH 3/6] mci: cleanup code around ready_for_use flag
Date: Mon, 17 Mar 2025 10:34:35 +0100 [thread overview]
Message-ID: <20250317-mci-misc-cleanup-v1-3-24b4d6f5d31a@pengutronix.de> (raw)
In-Reply-To: <20250317-mci-misc-cleanup-v1-0-24b4d6f5d31a@pengutronix.de>
struct mci::ready_for_use is a flag, thus should be boolean. Also
no need to have an extra function which returns a negative error
code when the flag is set. Just check for the flag where needed.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mci/mci-core.c | 29 ++++-------------------------
include/mci.h | 2 +-
2 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 975896d2d8..f29dc84f93 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -2373,7 +2373,7 @@ static void mci_info(struct device *dev)
struct mci_host *host = mci->host;
int bw;
- if (mci->ready_for_use == 0) {
+ if (!mci->ready_for_use) {
printf(" No information available:\n MCI card not probed yet\n");
return;
}
@@ -2455,23 +2455,6 @@ static void mci_parse_cid(struct mci *mci)
dev_add_param_uint32_fixed(dev, "cid_month", mci->cid.month, "%0u");
}
-/**
- * Check if the MCI card is already probed
- * @param mci MCI device instance
- * @return 0 when not probed yet, -EPERM if already probed
- *
- * @a barebox cannot really cope with hot plugging. So, probing an attached
- * MCI card is a one time only job. If its already done, there is no way to
- * return.
- */
-static int mci_check_if_already_initialized(struct mci *mci)
-{
- if (mci->ready_for_use != 0)
- return -EPERM;
-
- return 0;
-}
-
static struct block_device_ops mci_ops = {
.read = mci_sd_read,
.write = IS_ENABLED(CONFIG_MCI_WRITE) ? mci_sd_write : NULL,
@@ -2716,7 +2699,7 @@ static int mci_card_probe(struct mci *mci)
}
dev_dbg(&mci->dev, "Card is up and running now, registering as a disk\n");
- mci->ready_for_use = 1; /* TODO now or later? */
+ mci->ready_for_use = true; /* TODO now or later? */
for (i = 0; i < mci->nr_parts; i++) {
struct mci_part *part = &mci->part[i];
@@ -2775,8 +2758,7 @@ static int mci_set_probe(struct param_d *param, void *priv)
if (!mci->probe)
return 0;
- rc = mci_check_if_already_initialized(mci);
- if (rc != 0)
+ if (mci->ready_for_use)
return 0;
rc = mci_card_probe(mci);
@@ -2788,10 +2770,7 @@ static int mci_set_probe(struct param_d *param, void *priv)
int mci_detect_card(struct mci_host *host)
{
- int rc;
-
- rc = mci_check_if_already_initialized(host->mci);
- if (rc != 0)
+ if (host->mci->ready_for_use)
return 0;
return mci_card_probe(host->mci);
diff --git a/include/mci.h b/include/mci.h
index 689ca7167f..db1333999a 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -660,7 +660,7 @@ struct mci {
unsigned write_bl_len;
unsigned erase_grp_size;
uint64_t capacity; /**< Card's data capacity in bytes */
- int ready_for_use; /** true if already probed */
+ bool ready_for_use; /** true if already probed */
int dsr_imp; /**< DSR implementation state from CSD */
u8 *ext_csd;
int probe;
--
2.39.5
next prev parent reply other threads:[~2025-03-17 9:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-17 9:34 [PATCH 0/6] mci: some cleanups Sascha Hauer
2025-03-17 9:34 ` [PATCH 1/6] mci: use struct cid Sascha Hauer
2025-03-17 9:41 ` Alexander Shiyan
2025-03-17 10:53 ` Sascha Hauer
2025-03-17 9:34 ` [PATCH 2/6] mmc: merge block read/write functions Sascha Hauer
2025-03-17 9:34 ` Sascha Hauer [this message]
2025-03-17 9:34 ` [PATCH 4/6] mci: mci_spi: remove stray return 0 Sascha Hauer
2025-03-17 9:34 ` [PATCH 5/6] mci: mci_spi: fix warning message Sascha Hauer
2025-03-17 9:34 ` [PATCH 6/6] mci: mci_spi: use mci_of_parse() 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=20250317-mci-misc-cleanup-v1-3-24b4d6f5d31a@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