diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-30 08:42:28 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-09 23:03:58 +0100 |
commit | cf348c5510bb07f213f7b725b26e7fc0c79dc36e (patch) | |
tree | fbaaedc283d8571bd1af2e6d3ad2ca5178919caa /drivers/mtd/nand | |
parent | 10227d518c8a967e5cc552d24545e0ca2c59f84e (diff) | |
download | barebox-cf348c5510bb07f213f7b725b26e7fc0c79dc36e.tar.gz barebox-cf348c5510bb07f213f7b725b26e7fc0c79dc36e.tar.xz |
mtd: rename class_dev to dev
The mtds own device is named 'dev' in the Kernel whereas it's named
'class_dev' in barebox. Rename it to 'dev' for better compatilibility
to the Kernel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 12 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_denali.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_imx.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_mrvl_nfc.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_mxs.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_omap_gpmc.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_orion.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_s3c24xx.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nomadik_nand.c | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 80634e3798..90656bcb5d 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1331,7 +1331,7 @@ static int __init atmel_nand_probe(struct device_d *dev) } nand_chip->priv = host; /* link the private data structures */ - mtd->class_dev.parent = dev; + mtd->dev.parent = dev; /* Set address of NAND IO lines */ nand_chip->IO_ADDR_R = host->io_base; diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index b8438b2891..f869c21705 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3891,7 +3891,7 @@ static int mtd_set_erasebad(struct param_d *param, void *priv) } if (!mtd->allow_erasebad) - dev_warn(&mtd->class_dev, + dev_warn(&mtd->dev, "Allowing to erase bad blocks. This may be dangerous!\n"); mtd->allow_erasebad = true; @@ -3940,17 +3940,17 @@ int add_mtd_nand_device(struct nand_chip *chip, char *devname) return ret; if (IS_ENABLED(CONFIG_NAND_ALLOW_ERASE_BAD)) - dev_add_param_bool(&mtd->class_dev, "erasebad", mtd_set_erasebad, + dev_add_param_bool(&mtd->dev, "erasebad", mtd_set_erasebad, NULL, &mtd->p_allow_erasebad, mtd); - dev_add_param_enum(&mtd->class_dev, "bbt", NULL, mtd_get_bbt_type, + dev_add_param_enum(&mtd->dev, "bbt", NULL, mtd_get_bbt_type, &chip->bbt_type, bbt_type_strings, ARRAY_SIZE(bbt_type_strings), mtd); - dev_add_param_uint32_ro(&mtd->class_dev, "ecc.bytes", &chip->ecc.bytes, "%u"); - dev_add_param_uint32_ro(&mtd->class_dev, "ecc.strength", &chip->ecc.strength, "%u"); - dev_add_param_uint32_ro(&mtd->class_dev, "ecc.size", &chip->ecc.size, "%u"); + dev_add_param_uint32_ro(&mtd->dev, "ecc.bytes", &chip->ecc.bytes, "%u"); + dev_add_param_uint32_ro(&mtd->dev, "ecc.strength", &chip->ecc.strength, "%u"); + dev_add_param_uint32_ro(&mtd->dev, "ecc.size", &chip->ecc.size, "%u"); return ret; } diff --git a/drivers/mtd/nand/nand_denali.c b/drivers/mtd/nand/nand_denali.c index ba3a307c62..629281061b 100644 --- a/drivers/mtd/nand/nand_denali.c +++ b/drivers/mtd/nand/nand_denali.c @@ -1396,7 +1396,7 @@ int denali_init(struct denali_nand_info *denali) if (!denali->buf.buf) return -ENOMEM; - mtd->class_dev.parent = denali->dev; + mtd->dev.parent = denali->dev; denali_hw_init(denali); denali_drv_init(denali); diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index cc3494e7d3..d566c941e7 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -1187,7 +1187,7 @@ static int imxnd_create_bbt(struct nand_chip *chip) if (ret) { bbt[i >> 3] |= 0x03 << (i & 0x6); - dev_info(mtd->class_dev.parent, "Bad eraseblock %d at 0x%08x\n", + dev_info(mtd->dev.parent, "Bad eraseblock %d at 0x%08x\n", i >> 1, (unsigned int)from); } @@ -1337,7 +1337,7 @@ static int __init imxnd_probe(struct device_d *dev) /* structures must be linked */ this = &host->nand; mtd = &this->mtd; - mtd->class_dev.parent = dev; + mtd->dev.parent = dev; mtd->name = "imx_nand"; /* 50 us command delay time */ diff --git a/drivers/mtd/nand/nand_mrvl_nfc.c b/drivers/mtd/nand/nand_mrvl_nfc.c index c6636120ea..3f5e04b716 100644 --- a/drivers/mtd/nand/nand_mrvl_nfc.c +++ b/drivers/mtd/nand/nand_mrvl_nfc.c @@ -1118,7 +1118,7 @@ static struct mrvl_nand_host *alloc_nand_resource(struct device_d *dev) host->num_cs = 1; host->cs = 0; mtd = &host->chip.mtd; - mtd->class_dev.parent = dev; + mtd->dev.parent = dev; mtd->name = "mrvl_nand"; chip = &host->chip; diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c index 6c77247bf5..8075f6a854 100644 --- a/drivers/mtd/nand/nand_mxs.c +++ b/drivers/mtd/nand/nand_mxs.c @@ -338,7 +338,7 @@ static int mxs_nand_calc_geo(struct nand_chip *chip) int gf_len = 13; /* length of Galois Field for non-DDR nand */ int max_ecc_strength; - nand_of_parse_node(mtd, mtd->class_dev.parent->device_node); + nand_of_parse_node(mtd, mtd->dev.parent->device_node); max_ecc_strength = ((mtd->oobsize - MXS_NAND_METADATA_SIZE) * 8) / (gf_len * ecc_chunk_count); @@ -2191,7 +2191,7 @@ static int mxs_nand_probe(struct device_d *dev) /* structures must be linked */ chip = &nand_info->nand_chip; mtd = &nand_info->nand_chip.mtd; - mtd->class_dev.parent = dev; + mtd->dev.parent = dev; chip->priv = nand_info; diff --git a/drivers/mtd/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c index 52bd2cf542..6ad06288eb 100644 --- a/drivers/mtd/nand/nand_omap_gpmc.c +++ b/drivers/mtd/nand/nand_omap_gpmc.c @@ -1192,7 +1192,7 @@ static int gpmc_nand_probe(struct device_d *pdev) nand->priv = (void *)oinfo; minfo = &nand->mtd; - minfo->class_dev.parent = pdev; + minfo->dev.parent = pdev; if (pdata->cs >= GPMC_NUM_CS) { dev_dbg(pdev, "Invalid CS!\n"); diff --git a/drivers/mtd/nand/nand_orion.c b/drivers/mtd/nand/nand_orion.c index 445d48c363..796c53e4c4 100644 --- a/drivers/mtd/nand/nand_orion.c +++ b/drivers/mtd/nand/nand_orion.c @@ -114,7 +114,7 @@ static int orion_nand_probe(struct device_d *dev) if (!of_property_read_u32(dev_node, "chip-delay", &val)) chip->chip_delay = (u8)val; - mtd->class_dev.parent = dev; + mtd->dev.parent = dev; chip->priv = priv; chip->IO_ADDR_R = chip->IO_ADDR_W = io_base; chip->cmd_ctrl = orion_nand_cmd_ctrl; diff --git a/drivers/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c index 2b539395fd..ac95973194 100644 --- a/drivers/mtd/nand/nand_s3c24xx.c +++ b/drivers/mtd/nand/nand_s3c24xx.c @@ -421,7 +421,7 @@ static int s3c24x0_nand_probe(struct device_d *dev) /* structures must be linked */ chip = &host->nand; mtd = &chip->mtd; - mtd->class_dev.parent = dev; + mtd->dev.parent = dev; /* init the default settings */ diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index 286044a963..55aa756826 100644 --- a/drivers/mtd/nand/nomadik_nand.c +++ b/drivers/mtd/nand/nomadik_nand.c @@ -198,7 +198,7 @@ static int nomadik_nand_probe(struct device_d *dev) nand = &host->nand; mtd = &nand->mtd; nand->priv = host; - mtd->class_dev.parent = dev; + mtd->dev.parent = dev; nand->IO_ADDR_W = nand->IO_ADDR_R = dev_request_mem_region_by_name(dev, "nand_data"); if (IS_ERR(nand->IO_ADDR_W)) |