From: Michael Trimarchi <michael@amarulasolutions.com>
To: linux-amarula@amarulasolutions.com,
Dario Binacchi <dario.binacchi@amarulasolutions.com>,
Tommaso Merciai <tommaso.merciai@amarulasolutions.com>,
Boris Brezillon <bbrezillon@kernel.org>,
Richard Weinberger <richard@nod.at>,
Patrice Chotard <patrice.chotard@foss.st.com>,
Marek Vasut <marex@denx.de>, Wolfgang Denk <wd@denx.de>,
u-boot@lists.denx.de (open list)
Cc: u-boot@lists.denx.de (open list)
Subject: [PATCH 04/11] mtd: nand: Get rid of mtd variable in function calls
Date: Thu, 14 Jul 2022 16:35:36 +0200 [thread overview]
Message-ID: <20220714143543.448991-5-michael@amarulasolutions.com> (raw)
In-Reply-To: <20220714143543.448991-1-michael@amarulasolutions.com>
chip points to mtd. Passing chip is enough to have a reference
to mtd when is necessary
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
---
drivers/mtd/nand/raw/nand_base.c | 20 +++++++++++---------
include/linux/mtd/rawnand.h | 3 +--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 3b9c78cb24..7d52372af5 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -4160,8 +4160,9 @@ static int nand_get_bits_per_cell(u8 cellinfo)
* chip. The rest of the parameters must be decoded according to generic or
* manufacturer-specific "extended ID" decoding patterns.
*/
-static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip)
+static void nand_decode_ext_id(struct nand_chip *chip)
{
+ struct mtd_info *mtd = &chip->mtd;
int extid, id_len;
/* The 3rd id byte holds MLC / multichip data */
chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]);
@@ -4291,7 +4292,7 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip)
* compliant and does not have a full-id or legacy-id entry in the nand_ids
* table.
*/
-static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chip)
+static void nand_manufacturer_detect(struct nand_chip *chip)
{
/*
* Try manufacturer detection if available and use
@@ -4301,7 +4302,7 @@ static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chi
chip->manufacturer.desc->ops->detect)
chip->manufacturer.desc->ops->detect(chip);
else
- nand_decode_ext_id(mtd, chip);
+ nand_decode_ext_id(chip);
}
/*
@@ -4324,9 +4325,10 @@ static int nand_manufacturer_init(struct nand_chip *chip)
* decodes a matching ID table entry and assigns the MTD size parameters for
* the chip.
*/
-static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip,
+static void nand_decode_id(struct nand_chip *chip,
struct nand_flash_dev *type)
{
+ struct mtd_info *mtd = &chip->mtd;
int maf_id = chip->id.data[0];
mtd->erasesize = type->erasesize;
@@ -4439,11 +4441,11 @@ static const struct nand_manufacturers *nand_get_manufacturer_desc(u8 id)
/*
* Get the flash and manufacturer id and lookup if the type is supported.
*/
-struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
- struct nand_chip *chip,
+struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip,
int *maf_id, int *dev_id,
struct nand_flash_dev *type)
{
+ struct mtd_info *mtd = &chip->mtd;
const struct nand_manufacturers *manufacturer_desc;
int busw, ret;
u8 *id_data = chip->id.data;
@@ -4539,9 +4541,9 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
chip->chipsize = (uint64_t)type->chipsize << 20;
if (!type->pagesize) {
- nand_manufacturer_detect(mtd, chip);
+ nand_manufacturer_detect(chip);
} else {
- nand_decode_id(mtd, chip, type);
+ nand_decode_id(chip, type);
}
/* Get chip options */
@@ -4731,7 +4733,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16);
/* Read the flash type */
- type = nand_get_flash_type(mtd, chip, &nand_maf_id,
+ type = nand_get_flash_type(chip, &nand_maf_id,
&nand_dev_id, table);
if (IS_ERR(type)) {
diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
index 57fe7fb47b..d8141cb4d1 100644
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
@@ -29,8 +29,7 @@ struct nand_flash_dev;
struct device_node;
/* Get the flash and manufacturer id and lookup if the type is supported. */
-struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
- struct nand_chip *chip,
+struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip,
int *maf_id, int *dev_id,
struct nand_flash_dev *type);
--
2.34.1
next prev parent reply other threads:[~2022-07-14 14:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220714143543.448991-1-michael@amarulasolutions.com>
2022-07-14 14:35 ` [PATCH 01/11] mtd: nand: Get rid of busw parameter Michael Trimarchi
2022-07-14 14:35 ` [PATCH 02/11] mtd: nand: Store nand ID in struct nand_chip Michael Trimarchi
2022-07-14 14:35 ` [PATCH 03/11] mtd: nand: Add manufacturer specific initialization/detection steps Michael Trimarchi
2022-07-14 14:35 ` Michael Trimarchi [this message]
2022-07-14 14:35 ` [PATCH 05/11] mtd: nand: Export symbol nand_decode_ext_id Michael Trimarchi
2022-07-14 14:35 ` [PATCH 06/11] mtd: nand: Move Samsung specific init/detection logic in nand_samsung.c Michael Trimarchi
2022-07-14 14:35 ` [PATCH 07/11] mtd: nand: Move Hynix specific init/detection logic in nand_hynix.c Michael Trimarchi
2022-07-14 14:35 ` [PATCH 08/11] mtd: nand: Move Toshiba specific init/detection logic in nand_toshiba.c Michael Trimarchi
2022-07-14 14:35 ` [PATCH 09/11] mtd: nand: Move Micron specific init logic in nand_micron.c Michael Trimarchi
2022-07-14 14:35 ` [PATCH 10/11] mtd: nand: Move AMD/Spansion specific init/detection logic in nand_amd.c Michael Trimarchi
2022-07-14 14:35 ` [PATCH 11/11] mtd: nand: Move Macronix specific initialization in nand_macronix.c Michael Trimarchi
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=20220714143543.448991-5-michael@amarulasolutions.com \
--to=michael@amarulasolutions.com \
--cc=bbrezillon@kernel.org \
--cc=dario.binacchi@amarulasolutions.com \
--cc=linux-amarula@amarulasolutions.com \
--cc=marex@denx.de \
--cc=patrice.chotard@foss.st.com \
--cc=richard@nod.at \
--cc=tommaso.merciai@amarulasolutions.com \
--cc=u-boot@lists.denx.de \
--cc=wd@denx.de \
/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