From 10227d518c8a967e5cc552d24545e0ca2c59f84e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 30 Oct 2020 08:36:00 +0100 Subject: mtd: Use classdev->parent Instead of mtd->parent we can use mtd->classdev.parent which points to the same device. With this we can remove the 'parent' member of struct mtd_info. This member exists in the Linux kernel as well, but is of type struct mtd_info, so this is done as preparation to re-add mtd->parent with the same type as in Linux. Signed-off-by: Sascha Hauer --- drivers/mtd/nand/atmel_nand.c | 2 +- drivers/mtd/nand/nand_denali.c | 2 +- drivers/mtd/nand/nand_imx.c | 4 ++-- drivers/mtd/nand/nand_mrvl_nfc.c | 2 +- drivers/mtd/nand/nand_mxs.c | 4 ++-- drivers/mtd/nand/nand_omap_gpmc.c | 2 +- drivers/mtd/nand/nand_orion.c | 2 +- drivers/mtd/nand/nand_s3c24xx.c | 2 +- drivers/mtd/nand/nomadik_nand.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers/mtd/nand') diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index e250df82d7..80634e3798 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->parent = dev; + mtd->class_dev.parent = dev; /* Set address of NAND IO lines */ nand_chip->IO_ADDR_R = host->io_base; diff --git a/drivers/mtd/nand/nand_denali.c b/drivers/mtd/nand/nand_denali.c index 77a09ede70..ba3a307c62 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->parent = denali->dev; + mtd->class_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 40877eafb6..cc3494e7d3 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->parent, "Bad eraseblock %d at 0x%08x\n", + dev_info(mtd->class_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->parent = dev; + mtd->class_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 0a7c0d4a9a..c6636120ea 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->parent = dev; + mtd->class_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 d4f0262755..6c77247bf5 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->parent->device_node); + nand_of_parse_node(mtd, mtd->class_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->parent = dev; + mtd->class_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 b7c35f8899..52bd2cf542 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->parent = pdev; + minfo->class_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 ac1c8442c0..445d48c363 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->parent = dev; + mtd->class_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 9df7f6cba2..2b539395fd 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->parent = dev; + mtd->class_dev.parent = dev; /* init the default settings */ diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index 9918548357..286044a963 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->parent = dev; + mtd->class_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)) -- cgit v1.2.3