From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH 04/16] mtd: mxs_nand: Fix not calling dev_xxx with a device
Date: Sun, 4 Oct 2020 21:39:45 -0400 [thread overview]
Message-ID: <20201005013958.498888-5-seanga2@gmail.com> (raw)
In-Reply-To: <20201005013958.498888-1-seanga2@gmail.com>
This includes device_compat.h, and fixes several calls to dev_xxx.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
---
drivers/mtd/nand/raw/mxs_nand.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index a7852a841c..e6bbfac4d6 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -16,19 +16,20 @@
#include <common.h>
#include <cpu_func.h>
#include <dm.h>
+#include <dm/device_compat.h>
+#include <malloc.h>
+#include <mxs_nand.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
#include <asm/cache.h>
+#include <asm/io.h>
+#include <asm/mach-imx/regs-bch.h>
+#include <asm/mach-imx/regs-gpmi.h>
+#include <linux/errno.h>
#include <linux/mtd/rawnand.h>
#include <linux/sizes.h>
#include <linux/types.h>
-#include <malloc.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/mach-imx/regs-bch.h>
-#include <asm/mach-imx/regs-gpmi.h>
-#include <asm/arch/sys_proto.h>
-#include <mxs_nand.h>
#define MXS_NAND_DMA_DESCRIPTOR_COUNT 4
@@ -115,13 +116,14 @@ static uint32_t mxs_nand_aux_status_offset(void)
return (MXS_NAND_METADATA_SIZE + 0x3) & ~0x3;
}
-static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct mtd_info *mtd,
- unsigned int *chunk_num)
+static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo,
+ struct mtd_info *mtd,
+ unsigned int *chunk_num)
{
unsigned int i, j;
if (geo->ecc_chunk0_size != geo->ecc_chunkn_size) {
- dev_err(this->dev, "The size of chunk0 must equal to chunkn\n");
+ dev_err(mtd->dev, "The size of chunk0 must equal to chunkn\n");
return false;
}
@@ -135,7 +137,7 @@ static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct m
if (j < geo->ecc_chunkn_size * 8) {
*chunk_num = i + 1;
- dev_dbg(this->dev, "Set ecc to %d and bbm in chunk %d\n",
+ dev_dbg(mtd->dev, "Set ecc to %d and bbm in chunk %d\n",
geo->ecc_strength, *chunk_num);
return true;
}
@@ -1118,7 +1120,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo)
if ((!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0) &&
mtd->oobsize < 1024) || nand_info->legacy_bch_geometry) {
- dev_warn(this->dev, "use legacy bch geometry\n");
+ dev_warn(mtd->dev, "use legacy bch geometry\n");
return mxs_nand_legacy_calc_ecc_layout(geo, mtd);
}
--
2.28.0
next prev parent reply other threads:[~2020-10-05 1:39 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 1:39 [PATCH 00/16] dm: Remove redefinitions of dev_xxx macros Sean Anderson
2020-10-05 1:39 ` [PATCH 01/16] clk: sifive: Include device_compat.h Sean Anderson
2020-10-16 13:54 ` Tom Rini
2020-10-05 1:39 ` [PATCH 02/16] dm: syscon: Set LOG_CATEGORY Sean Anderson
2020-10-12 3:34 ` Simon Glass
2020-10-16 13:54 ` Tom Rini
2020-10-05 1:39 ` [PATCH 03/16] firmware: scmi: Include device_compat.h Sean Anderson
2020-10-12 3:34 ` Simon Glass
2020-10-16 13:54 ` Tom Rini
2020-10-05 1:39 ` Sean Anderson [this message]
2020-10-16 13:54 ` [PATCH 04/16] mtd: mxs_nand: Fix not calling dev_xxx with a device Tom Rini
2020-10-05 1:39 ` [PATCH 05/16] net: ldpaa_eth: Include device_compat.h Sean Anderson
2020-10-16 13:54 ` Tom Rini
2020-10-05 1:39 ` [PATCH 06/16] phy: " Sean Anderson
2020-10-16 13:54 ` Tom Rini
2020-10-05 1:39 ` [PATCH 07/16] ram: imxrt: " Sean Anderson
2020-10-16 13:54 ` Tom Rini
2020-10-05 1:39 ` [PATCH 08/16] spi: nsp_fspi: " Sean Anderson
2020-10-05 10:07 ` [EXT] " Kuldeep Singh
2020-10-16 13:55 ` [PATCH 08/16] spi: nxp_fspi: " Tom Rini
2020-10-05 1:39 ` [PATCH 09/16] spi: fsl_qspi: " Sean Anderson
2020-10-16 13:55 ` Tom Rini
2020-10-05 1:39 ` [PATCH 10/16] tee: optee: " Sean Anderson
2020-10-12 3:34 ` Simon Glass
2020-10-16 13:55 ` Tom Rini
2020-10-16 14:10 ` Igor Opaniuk
2020-10-05 1:39 ` [PATCH 11/16] timer: " Sean Anderson
2020-10-12 3:34 ` Simon Glass
2020-10-16 13:55 ` Tom Rini
2020-10-05 1:39 ` [PATCH 12/16] usb: xhci: " Sean Anderson
2020-10-16 13:55 ` Tom Rini
2020-10-05 1:39 ` [PATCH 13/16] usb: musb-new: " Sean Anderson
2020-10-16 13:55 ` Tom Rini
2020-10-05 1:39 ` [PATCH 14/16] usb: musb-new: mt85xx: Fix not calling dev_err with a device Sean Anderson
2020-10-16 13:55 ` Tom Rini
2020-10-05 1:39 ` [PATCH 15/16] linux/compat.h: Remove redefinition of dev_xxx macros Sean Anderson
2020-10-12 3:34 ` Simon Glass
2020-10-16 13:56 ` Tom Rini
2020-10-05 1:39 ` [PATCH 16/16] dm: Don't undefine " Sean Anderson
2020-10-12 3:34 ` Simon Glass
2020-10-16 13:56 ` Tom Rini
2020-10-16 12:42 ` [PATCH 1/3] arm: fsl-layerscape: Include device_compat.h in soc.c Tom Rini
2020-10-16 12:42 ` [PATCH 2/3] clk: at91: Include device_compat.h in compat.c Tom Rini
2020-10-16 13:56 ` Tom Rini
2020-10-16 12:42 ` [PATCH 3/3] usb: dwc3: Include device_compat.h in dwc3-octeon-glue.c Tom Rini
2020-10-16 13:56 ` Tom Rini
2020-10-16 13:56 ` [PATCH 1/3] arm: fsl-layerscape: Include device_compat.h in soc.c Tom Rini
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=20201005013958.498888-5-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=u-boot@lists.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