[PATCH 00/60] Fix mtds not showing up in sysfs

[PATCH 00/60] Fix mtds not showing up in sysfs

[Frans Klaver]

Hi there,

Here's a series stemming from a previous discussion about mtd devices not
showing up in sysfs properly[1]. While the original series 27 patches, this one
should cover all drivers that suffer from this issue, and shamelessly hits 60.
If it's preferred that the patches be more logically grouped, like by mtd
subdir, I'd be happy to resend. Until then, we'll make do with this.

This series teaches add_mtd_device() to set name and owner based on the set
parent device, if dev.parent is filled in, and name resp. owner isn't already
filled in. All drivers that I could find that don't set the parent are touched
to set the parent device, and remove the name and owner assignment in cases
where I'm sure the resulting name will not change. Only the latter is done in
cases where I would find the driver explicitly filling in the owner.

I was able to actually test nand/omap2. Compile tested are:
  devices/docg3
  devices/m25p80
  devices/mtd_dataflash
  devices/sst251
  lpddr/lpddr2_nvm
  maps/gpio-addr-flash
  maps/intel_vr_nor
  maps/latch-addr-flash
  maps/physmap
  maps/physmap_of
  maps/plat-ram
  nand/cafe_nand
  nand/denali
  nand/docg4
  nand/gpio
  nand/plat_nand
  onenand/generic

The rest is untested. If you have suggestions for me to compile-test most of
them for a next run, I'd be much obliged.

Thanks for having a go at your favorite MTD,
Frans

[1] https://lkml.org/lkml/2014/5/26/586

Frans Klaver (60):
  mtd: core: tone down suggestion that dev.parent should be set
  mtd: core: set some defaults when dev.parent is set
  mtd: devices: bcm47xxflash: show device in sysfs
  mtd: devices: docg3: show device in sysfs
  mtd: devices: m25p80: show device in sysfs
  mtd: devices: mtd_dataflash: drop owner assignment
  mtd: devices: spear_smi: show device in sysfs
  mtd: devices: sst251: show device in sysfs
  mtd: lpddr: show device in sysfs
  mtd: maps: bfin-async-flash: show device in sysfs
  mtd: maps: gpio-addr-flash: show device in sysfs
  mtd: maps: intel_vr_nor: show device in sysfs
  mtd: maps: ixp4xx: show device in sysfs
  mtd: maps: lantiq-flash: show device in sysfs
  mtd: maps: latch-addr-flash: show device in sysfs
  mtd: maps: physmap: drop owner assignment
  mtd: maps: physmap_of: drop owner assignment
  mtd: maps: plat_ram: drop owner assignment
  mtd: maps: pxa2xx-flash: show device in sysfs
  mtd: maps: rbtx4939-flash: show device in sysfs
  mtd: maps: sa1100-flash: show device in sysfs
  mtd: nand: atmel_nand: show device in sysfs
  mtd: nand: au1550nd: show device in sysfs
  mtd: nand: bcm47xxnflash: show device in sysfs
  mtd: nand: bf5xx_nand: show device in sysfs
  mtd: nand: cafe_nand: drop owner assignment
  mtd: nand: davinci_nand: drop owner and name assignment
  mtd: nand: denali: drop owner assignment
  mtd: nand: docg4: show device in sysfs
  mtd: nand: fsl_elbc_nand: show device in sysfs
  mtd: nand: fsl_ifc_nand: show device in sysfs
  mtd: nand: fsl_upm: show device in sysfs
  mtd: nand: fsmc_nand: show device in sysfs
  mtd: nand: gpio: show device in sysfs
  mtd: nand: gpmi-nand: show device in sysfs
  mtd: nand: hisi504_nand: drop owner assignment
  mtd: nand: jz4740_nand: show device in sysfs
  mtd: nand: lpc32xx_mlc: drop owner assignment
  mtd: nand: mpc5121_nfc: show device in sysfs
  mtd: nand: mxc_nand: drop owner assignment
  mtd: nand: ndfc: show device in sysfs
  mtd: nand: nuc900_nand: show device in sysfs
  mtd: nand: omap2: show device structure in sysfs
  mtd: nand: orion_nand: show device in sysfs
  mtd: nand: pasemi_nand: show device in sysfs
  mtd: nand: plat_nand: show device in sysfs
  mtd: nand: pxa3xx_nand: show device in sysfs
  mtd: nand: r852: drop owner assignment
  mtd: nand: s3c2410: show device in sysfs
  mtd: nand: sh_flctl: show device in sysfs
  mtd: nand: sharpsl: show device in sysfs
  mtd: nand: socrates_nand: drop owner assignment
  mtd: nand: sunxi_nand: drop owner assignment
  mtd: nand: tmio_nand: show device in sysfs
  mtd: nand: txx9ndfmc: show device in sysfs
  mtd: onenand: generic: show device in sysfs
  mtd: onenand: omap2: drop owner and name assignment
  mtd: onenand: samsung: drop owner assignment
  mtd: spi-nor: fsl-quadspi: show device in sysfs
  staging: mt29f_spinand: show device in sysfs

 drivers/mtd/devices/bcm47xxsflash.c           |  7 ++++---
 drivers/mtd/devices/docg3.c                   |  2 +-
 drivers/mtd/devices/m25p80.c                  |  1 +
 drivers/mtd/devices/mtd_dataflash.c           |  1 -
 drivers/mtd/devices/spear_smi.c               |  1 +
 drivers/mtd/devices/sst25l.c                  |  3 +--
 drivers/mtd/lpddr/lpddr2_nvm.c                |  1 +
 drivers/mtd/maps/bfin-async-flash.c           |  1 +
 drivers/mtd/maps/gpio-addr-flash.c            |  2 +-
 drivers/mtd/maps/intel_vr_nor.c               |  2 +-
 drivers/mtd/maps/ixp4xx.c                     |  2 +-
 drivers/mtd/maps/lantiq-flash.c               |  2 +-
 drivers/mtd/maps/latch-addr-flash.c           |  2 +-
 drivers/mtd/maps/physmap.c                    |  1 -
 drivers/mtd/maps/physmap_of.c                 |  1 -
 drivers/mtd/maps/plat-ram.c                   |  1 -
 drivers/mtd/maps/pxa2xx-flash.c               |  2 +-
 drivers/mtd/maps/rbtx4939-flash.c             |  2 +-
 drivers/mtd/maps/sa1100-flash.c               |  2 +-
 drivers/mtd/mtdcore.c                         | 11 ++++++++++-
 drivers/mtd/nand/atmel_nand.c                 |  2 +-
 drivers/mtd/nand/au1550nd.c                   |  2 +-
 drivers/mtd/nand/bcm47xxnflash/main.c         |  2 +-
 drivers/mtd/nand/bf5xx_nand.c                 |  2 +-
 drivers/mtd/nand/cafe_nand.c                  |  1 -
 drivers/mtd/nand/davinci_nand.c               |  3 ---
 drivers/mtd/nand/denali.c                     |  1 -
 drivers/mtd/nand/docg4.c                      |  2 +-
 drivers/mtd/nand/fsl_elbc_nand.c              |  2 +-
 drivers/mtd/nand/fsl_ifc_nand.c               |  2 +-
 drivers/mtd/nand/fsl_upm.c                    |  2 +-
 drivers/mtd/nand/fsmc_nand.c                  |  2 +-
 drivers/mtd/nand/gpio.c                       |  2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c        |  2 +-
 drivers/mtd/nand/hisi504_nand.c               |  1 -
 drivers/mtd/nand/jz4740_nand.c                |  2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                |  1 -
 drivers/mtd/nand/mpc5121_nfc.c                |  1 +
 drivers/mtd/nand/mxc_nand.c                   |  1 -
 drivers/mtd/nand/ndfc.c                       |  2 +-
 drivers/mtd/nand/nuc900_nand.c                |  2 +-
 drivers/mtd/nand/omap2.c                      |  3 +--
 drivers/mtd/nand/orion_nand.c                 |  2 +-
 drivers/mtd/nand/pasemi_nand.c                |  2 +-
 drivers/mtd/nand/plat_nand.c                  |  3 +--
 drivers/mtd/nand/pxa3xx_nand.c                |  2 +-
 drivers/mtd/nand/r852.c                       |  1 -
 drivers/mtd/nand/s3c2410.c                    |  2 +-
 drivers/mtd/nand/sh_flctl.c                   |  1 +
 drivers/mtd/nand/sharpsl.c                    |  2 +-
 drivers/mtd/nand/socrates_nand.c              |  1 -
 drivers/mtd/nand/sunxi_nand.c                 |  1 -
 drivers/mtd/nand/tmio_nand.c                  |  1 +
 drivers/mtd/nand/txx9ndfmc.c                  |  2 +-
 drivers/mtd/onenand/generic.c                 |  3 +--
 drivers/mtd/onenand/omap2.c                   |  2 --
 drivers/mtd/onenand/samsung.c                 |  1 -
 drivers/mtd/spi-nor/fsl-quadspi.c             |  1 +
 drivers/staging/mt29f_spinand/mt29f_spinand.c |  3 +--
 59 files changed, 56 insertions(+), 61 deletions(-)

-- 
2.2.2

[PATCH 01/60] mtd: core: tone down suggestion that dev.parent should be set

[Frans Klaver]

add_mtd_device() has a comment suggesting that the caller should have
set dev.parent. This is required to have the device show up in sysfs,
but not for proper operation of the mtd device itself. Currently we have
five drivers registering mtd devices during module initialization, so
they don't actually provide a parent device to link to. That means we
cannot WARN_ON() here, as it would trigger false positives.

Make the comment a bit less firm in its assertion that dev.parent should
be set.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/mtdcore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 11883bd..2093676 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -422,7 +422,7 @@ int add_mtd_device(struct mtd_info *mtd)
 	}
 
 	/* Caller should have set dev.parent to match the
-	 * physical device.
+	 * physical device, if appropriate.
 	 */
 	mtd->dev.type = &mtd_devtype;
 	mtd->dev.class = &mtd_class;
-- 
2.2.2

[PATCH 02/60] mtd: core: set some defaults when dev.parent is set

[Frans Klaver]

If a parent device is set, add_mtd_device() has enough knowledge to fill
in some sane default values for the module name and owner. Do so if they
aren't already set.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/mtdcore.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 2093676..487e467 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -412,6 +412,15 @@ int add_mtd_device(struct mtd_info *mtd)
 	mtd->erasesize_mask = (1 << mtd->erasesize_shift) - 1;
 	mtd->writesize_mask = (1 << mtd->writesize_shift) - 1;
 
+	if (mtd->dev.parent) {
+		if (!mtd->owner)
+			mtd->owner = mtd->dev.parent->driver->owner;
+		if (!mtd->name)
+			mtd->name = dev_name(mtd->dev.parent);
+	} else {
+		pr_debug("mtd device won't show a device entry in sysfs\n");
+	}
+
 	/* Some chips always power up locked. Unlock them now */
 	if ((mtd->flags & MTD_WRITEABLE) && (mtd->flags & MTD_POWERUP_LOCK)) {
 		error = mtd_unlock(mtd, 0, mtd->size);
-- 
2.2.2

[PATCH 03/60] mtd: devices: bcm47xxflash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/devices/bcm47xxsflash.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c
index 3d008a9..347bb83 100644
--- a/drivers/mtd/devices/bcm47xxsflash.c
+++ b/drivers/mtd/devices/bcm47xxsflash.c
@@ -237,13 +237,14 @@ static int bcm47xxsflash_write(struct mtd_info *mtd, loff_t to, size_t len,
 	return 0;
 }
 
-static void bcm47xxsflash_fill_mtd(struct bcm47xxsflash *b47s)
+static void bcm47xxsflash_fill_mtd(struct bcm47xxsflash *b47s,
+				   struct device *dev)
 {
 	struct mtd_info *mtd = &b47s->mtd;
 
 	mtd->priv = b47s;
+	mtd->dev.parent = dev;
 	mtd->name = "bcm47xxsflash";
-	mtd->owner = THIS_MODULE;
 
 	mtd->type = MTD_NORFLASH;
 	mtd->flags = MTD_CAP_NORFLASH;
@@ -300,7 +301,7 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
 	b47s->blocksize = sflash->blocksize;
 	b47s->numblocks = sflash->numblocks;
 	b47s->size = sflash->size;
-	bcm47xxsflash_fill_mtd(b47s);
+	bcm47xxsflash_fill_mtd(b47s, &pdev->dev);
 
 	err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0);
 	if (err) {
-- 
2.2.2

[PATCH 04/60] mtd: devices: docg3: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/devices/docg3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 448ce42..dd851d6 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1841,7 +1841,6 @@ static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
 		mtd->erasesize /= 2;
 	mtd->writebufsize = mtd->writesize = DOC_LAYOUT_PAGE_SIZE;
 	mtd->oobsize = DOC_LAYOUT_OOB_SIZE;
-	mtd->owner = THIS_MODULE;
 	mtd->_erase = doc_erase;
 	mtd->_read = doc_read;
 	mtd->_write = doc_write;
@@ -1881,6 +1880,7 @@ doc_probe_device(struct docg3_cascade *cascade, int floor, struct device *dev)
 	if (!mtd)
 		goto nomem2;
 	mtd->priv = docg3;
+	mtd->dev.parent = dev;
 	bbt_nbpages = DIV_ROUND_UP(docg3->max_block + 1,
 				   8 * DOC_LAYOUT_PAGE_SIZE);
 	docg3->bbt = kzalloc(bbt_nbpages * DOC_LAYOUT_PAGE_SIZE, GFP_KERNEL);
-- 
2.2.2

[PATCH 05/60] mtd: devices: m25p80: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/devices/m25p80.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 85e35467..48eee8f 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -206,6 +206,7 @@ static int m25p_probe(struct spi_device *spi)
 
 	spi_set_drvdata(spi, flash);
 	flash->mtd.priv = nor;
+	flash->mtd.dev.parent = &spi->dev;
 	flash->spi = spi;
 
 	if (spi->mode & SPI_RX_QUAD)
-- 
2.2.2

[PATCH 06/60] mtd: devices: mtd_dataflash: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/devices/mtd_dataflash.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 0099aba..ca5ae8e 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -647,7 +647,6 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
 	device->size = nr_pages * pagesize;
 	device->erasesize = pagesize;
 	device->writesize = pagesize;
-	device->owner = THIS_MODULE;
 	device->type = MTD_DATAFLASH;
 	device->flags = MTD_WRITEABLE;
 	device->_erase = dataflash_erase;
-- 
2.2.2

[PATCH 07/60] mtd: devices: spear_smi: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/devices/spear_smi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 508bab3..015a1cf 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -854,6 +854,7 @@ static int spear_smi_setup_banks(struct platform_device *pdev,
 	else
 		flash->mtd.name = flash_devices[flash_index].name;
 
+	flash->mtd.dev.parent = &pdev->dev;
 	flash->mtd.type = MTD_NORFLASH;
 	flash->mtd.writesize = 1;
 	flash->mtd.flags = MTD_CAP_NORFLASH;
-- 
2.2.2

[PATCH 08/60] mtd: devices: sst251: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/devices/sst25l.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index c63ecbc..3928014 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -374,9 +374,8 @@ static int sst25l_probe(struct spi_device *spi)
 	data = dev_get_platdata(&spi->dev);
 	if (data && data->name)
 		flash->mtd.name = data->name;
-	else
-		flash->mtd.name = dev_name(&spi->dev);
 
+	flash->mtd.dev.parent   = &spi->dev;
 	flash->mtd.type		= MTD_NORFLASH;
 	flash->mtd.flags	= MTD_CAP_NORFLASH;
 	flash->mtd.erasesize	= flash_info->erase_size;
-- 
2.2.2

[PATCH 09/60] mtd: lpddr: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/lpddr/lpddr2_nvm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/lpddr/lpddr2_nvm.c b/drivers/mtd/lpddr/lpddr2_nvm.c
index 063cec4..2342277 100644
--- a/drivers/mtd/lpddr/lpddr2_nvm.c
+++ b/drivers/mtd/lpddr/lpddr2_nvm.c
@@ -460,6 +460,7 @@ static int lpddr2_nvm_probe(struct platform_device *pdev)
 
 	/* Populate mtd_info data structure */
 	*mtd = (struct mtd_info) {
+		.dev		= { .parent = &pdev->dev },
 		.name		= pdev->dev.init_name,
 		.type		= MTD_RAM,
 		.priv		= map,
-- 
2.2.2

[PATCH 10/60] mtd: maps: bfin-async-flash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/bfin-async-flash.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 41730fe..d10356c 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -163,6 +163,7 @@ static int bfin_flash_probe(struct platform_device *pdev)
 		kfree(state);
 		return -ENXIO;
 	}
+	state->mtd.dev.parent = &pdev->dev;
 
 	mtd_device_parse_register(state->mtd, part_probe_types, NULL,
 				  pdata->parts, pdata->nr_parts);
-- 
2.2.2

[PATCH 11/60] mtd: maps: gpio-addr-flash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/gpio-addr-flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 2fb3460..385305e 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -266,7 +266,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
 		kfree(state);
 		return -ENXIO;
 	}
-
+	state->mtd->dev.parent = &pdev->dev;
 
 	mtd_device_parse_register(state->mtd, part_probe_types, NULL,
 				  pdata->parts, pdata->nr_parts);
-- 
2.2.2

[PATCH 12/60] mtd: maps: intel_vr_nor: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/intel_vr_nor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c
index 5ab71f0..8bf7977 100644
--- a/drivers/mtd/maps/intel_vr_nor.c
+++ b/drivers/mtd/maps/intel_vr_nor.c
@@ -90,7 +90,7 @@ static int vr_nor_mtd_setup(struct vr_nor_mtd *p)
 	if (!p->info)
 		return -ENODEV;
 
-	p->info->owner = THIS_MODULE;
+	p->info->dev.parent = &p->dev->dev;
 
 	return 0;
 }
-- 
2.2.2

[PATCH 13/60] mtd: maps: ixp4xx: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/ixp4xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index b443074..e3180d5 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -226,7 +226,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
 		err = -ENXIO;
 		goto Error;
 	}
-	info->mtd->owner = THIS_MODULE;
+	info->mtd->dev.parent = &dev->dev;
 
 	/* Use the fast version */
 	info->map.write = ixp4xx_write16;
-- 
2.2.2

[PATCH 14/60] mtd: maps: lantiq-flash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/lantiq-flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index 33d26f5..0cef3ba 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -161,7 +161,7 @@ ltq_mtd_probe(struct platform_device *pdev)
 		return -ENXIO;
 	}
 
-	ltq_mtd->mtd->owner = THIS_MODULE;
+	ltq_mtd->mtd->dev.parent = &pdev->dev;
 
 	cfi = ltq_mtd->map->fldrv_priv;
 	cfi->addr_unlock1 ^= 1;
-- 
2.2.2

[PATCH 15/60] mtd: maps: latch-addr-flash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/latch-addr-flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c
index cadfbe0..6dc97aa 100644
--- a/drivers/mtd/maps/latch-addr-flash.c
+++ b/drivers/mtd/maps/latch-addr-flash.c
@@ -195,7 +195,7 @@ static int latch_addr_flash_probe(struct platform_device *dev)
 		err = -ENODEV;
 		goto iounmap;
 	}
-	info->mtd->owner = THIS_MODULE;
+	info->mtd->dev.parent = &dev->dev;
 
 	mtd_device_parse_register(info->mtd, NULL, NULL,
 				  latch_addr_data->parts,
-- 
2.2.2

[PATCH 16/60] mtd: maps: physmap: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/physmap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 4305fd6..cc2adbb 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -167,7 +167,6 @@ static int physmap_flash_probe(struct platform_device *dev)
 		} else {
 			devices_found++;
 		}
-		info->mtd[i]->owner = THIS_MODULE;
 		info->mtd[i]->dev.parent = &dev->dev;
 	}
 
-- 
2.2.2

[PATCH 17/60] mtd: maps: physmap_of: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/physmap_of.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index ff26e97..10954f7 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -288,7 +288,6 @@ static int of_flash_probe(struct platform_device *dev)
 		} else {
 			info->list_size++;
 		}
-		info->list[i].mtd->owner = THIS_MODULE;
 		info->list[i].mtd->dev.parent = &dev->dev;
 	}
 
-- 
2.2.2

[PATCH 18/60] mtd: maps: plat_ram: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/plat-ram.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 4b65c08..5157289 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -210,7 +210,6 @@ static int platram_probe(struct platform_device *pdev)
 		goto exit_free;
 	}
 
-	info->mtd->owner = THIS_MODULE;
 	info->mtd->dev.parent = &pdev->dev;
 
 	platram_setrw(info, PLATRAM_RW);
-- 
2.2.2

[PATCH 19/60] mtd: maps: pxa2xx-flash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/pxa2xx-flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 12fa75d..9adc4ef 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -93,7 +93,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
 			iounmap(info->map.cached);
 		return -EIO;
 	}
-	info->mtd->owner = THIS_MODULE;
+	info->mtd->dev.parent = &pdev->dev;
 
 	mtd_device_parse_register(info->mtd, probes, NULL, flash->parts,
 				  flash->nr_parts);
-- 
2.2.2

[PATCH 20/60] mtd: maps: rbtx4939-flash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/rbtx4939-flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c
index 5a7551a..18ee3614 100644
--- a/drivers/mtd/maps/rbtx4939-flash.c
+++ b/drivers/mtd/maps/rbtx4939-flash.c
@@ -96,7 +96,7 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
 		err = -ENXIO;
 		goto err_out;
 	}
-	info->mtd->owner = THIS_MODULE;
+	info->mtd.dev.parent = &dev->dev;
 	err = mtd_device_parse_register(info->mtd, NULL, NULL, pdata->parts,
 					pdata->nr_parts);
 
-- 
2.2.2

[PATCH 21/60] mtd: maps: sa1100-flash: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.
Incidentally, it seems the owner field in the concatenated mtds is not
actually used, so this shouldn't make much of a difference anyway.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/maps/sa1100-flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index ea69720..af04244 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -117,7 +117,6 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r
 		ret = -ENXIO;
 		goto err;
 	}
-	subdev->mtd->owner = THIS_MODULE;
 
 	printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %uMiB, %d-bit\n",
 		phys, (unsigned)(subdev->mtd->size >> 20),
@@ -234,6 +233,7 @@ static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev,
 		if (info->mtd == NULL)
 			ret = -ENXIO;
 	}
+	info->mtd->dev.parent = &pdev->dev;
 
 	if (ret == 0)
 		return info;
-- 
2.2.2

[PATCH 22/60] mtd: nand: atmel_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/atmel_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index d93c849..71b0d00 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -2126,7 +2126,7 @@ static int atmel_nand_probe(struct platform_device *pdev)
 
 	nand_chip->priv = host;		/* link the private data structures */
 	mtd->priv = nand_chip;
-	mtd->owner = THIS_MODULE;
+	mtd->dev.parent = &pdev->dev;
 
 	/* Set address of NAND IO lines */
 	nand_chip->IO_ADDR_R = host->io_base;
-- 
2.2.2

[PATCH 23/60] mtd: nand: au1550nd: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/au1550nd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index c0c3be1..08a130f 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -439,7 +439,7 @@ static int au1550nd_probe(struct platform_device *pdev)
 
 	this = &ctx->chip;
 	ctx->info.priv = this;
-	ctx->info.owner = THIS_MODULE;
+	ctx->info.dev.parent = &pdev->dev;
 
 	/* figure out which CS# r->start belongs to */
 	cs = find_nand_cs(r->start);
-- 
2.2.2

[PATCH 24/60] mtd: nand: bcm47xxnflash: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/bcm47xxnflash/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c
index 461577c..9ba0c0f 100644
--- a/drivers/mtd/nand/bcm47xxnflash/main.c
+++ b/drivers/mtd/nand/bcm47xxnflash/main.c
@@ -34,7 +34,7 @@ static int bcm47xxnflash_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	b47n->nand_chip.priv = b47n;
-	b47n->mtd.owner = THIS_MODULE;
+	b47n->mtd.dev.parent = &pdev->dev;
 	b47n->mtd.priv = &b47n->nand_chip; /* Required */
 	b47n->cc = container_of(nflash, struct bcma_drv_cc, nflash);
 
-- 
2.2.2

[PATCH 25/60] mtd: nand: bf5xx_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/bf5xx_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 4d8d4ba..acec344 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -782,7 +782,7 @@ static int bf5xx_nand_probe(struct platform_device *pdev)
 	/* initialise mtd info data struct */
 	mtd 		= &info->mtd;
 	mtd->priv	= chip;
-	mtd->owner	= THIS_MODULE;
+	mtd->dev.parent = &pdev->dev;
 
 	/* initialise the hardware */
 	err = bf5xx_nand_hw_init(info);
-- 
2.2.2

[PATCH 26/60] mtd: nand: cafe_nand: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/cafe_nand.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 9a0f45f..aa1dc55 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -604,7 +604,6 @@ static int cafe_nand_probe(struct pci_dev *pdev,
 
 	mtd->dev.parent = &pdev->dev;
 	mtd->priv = cafe;
-	mtd->owner = THIS_MODULE;
 
 	cafe->pdev = pdev;
 	cafe->mmio = pci_iomap(pdev, 0, 0);
-- 
2.2.2

[PATCH 27/60] mtd: nand: davinci_nand: drop owner and name assignment

[Frans Klaver]

Owner and name are automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/davinci_nand.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index feb6d18..78e0c4d 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -657,9 +657,6 @@ static int nand_davinci_probe(struct platform_device *pdev)
 	info->vaddr		= vaddr;
 
 	info->mtd.priv		= &info->chip;
-	info->mtd.name		= dev_name(&pdev->dev);
-	info->mtd.owner		= THIS_MODULE;
-
 	info->mtd.dev.parent	= &pdev->dev;
 
 	info->chip.IO_ADDR_R	= vaddr;
-- 
2.2.2

[PATCH 28/60] mtd: nand: denali: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/denali.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index f44c606..16e61de 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1457,7 +1457,6 @@ int denali_init(struct denali_nand_info *denali)
 	/* now that our ISR is registered, we can enable interrupts */
 	denali_set_intr_modes(denali, true);
 	denali->mtd.name = "denali-nand";
-	denali->mtd.owner = THIS_MODULE;
 	denali->mtd.priv = &denali->nand;
 
 	/* register the driver with the NAND core subsystem */
-- 
2.2.2

[PATCH 29/60] mtd: nand: docg4: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/docg4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index e5d7bca..510c12d 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -1316,7 +1316,7 @@ static int __init probe_docg4(struct platform_device *pdev)
 	doc = (struct docg4_priv *) (nand + 1);
 	mtd->priv = nand;
 	nand->priv = doc;
-	mtd->owner = THIS_MODULE;
+	mtd->dev.parent = &pdev->dev;
 	doc->virtadr = virtadr;
 	doc->dev = dev;
 
-- 
2.2.2

[PATCH 30/60] mtd: nand: fsl_elbc_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/fsl_elbc_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 04b22fd..0cd94a1 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -747,7 +747,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
 
 	/* Fill in fsl_elbc_mtd structure */
 	priv->mtd.priv = chip;
-	priv->mtd.owner = THIS_MODULE;
+	priv->mtd.dev.parent = &chip->dev;
 
 	/* set timeout to maximum */
 	priv->fmr = 15 << FMR_CWTO_SHIFT;
-- 
2.2.2

[PATCH 31/60] mtd: nand: fsl_ifc_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/fsl_ifc_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 4c05f4f..166ab74 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -880,7 +880,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
 
 	/* Fill in fsl_ifc_mtd structure */
 	priv->mtd.priv = chip;
-	priv->mtd.owner = THIS_MODULE;
+	priv->mtd.dev.parent = priv->dev;
 
 	/* fill in nand_chip structure */
 	/* set up function call table */
-- 
2.2.2

[PATCH 32/60] mtd: nand: fsl_upm: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/fsl_upm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 72755d7..d326369 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -176,7 +176,7 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
 		fun->chip.dev_ready = fun_chip_ready;
 
 	fun->mtd.priv = &fun->chip;
-	fun->mtd.owner = THIS_MODULE;
+	fun->mtd.dev.parent = fun->dev;
 
 	flash_np = of_get_next_child(upm_np, NULL);
 	if (!flash_np)
-- 
2.2.2

[PATCH 33/60] mtd: nand: fsmc_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/fsmc_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index edfaa21..9c7faa2 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -1012,7 +1012,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
 	mtd->priv = nand;
 	nand->priv = host;
 
-	host->mtd.owner = THIS_MODULE;
+	host->mtd.dev.parent = &pdev->dev;
 	nand->IO_ADDR_R = host->data_va;
 	nand->IO_ADDR_W = host->data_va;
 	nand->cmd_ctrl = fsmc_cmd_ctrl;
-- 
2.2.2

[PATCH 34/60] mtd: nand: gpio: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 73c4048..9ab97f9 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -275,7 +275,7 @@ static int gpio_nand_probe(struct platform_device *pdev)
 	chip->cmd_ctrl		= gpio_nand_cmd_ctrl;
 
 	gpiomtd->mtd_info.priv	= chip;
-	gpiomtd->mtd_info.owner	= THIS_MODULE;
+	gpiomtd->mtd_info.dev.parent = &pdev->dev;
 
 	platform_set_drvdata(pdev, gpiomtd);
 
-- 
2.2.2

[PATCH 35/60] mtd: nand: gpmi-nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 33f3c3c..f287690 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1897,7 +1897,7 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
 	/* init the MTD data structures */
 	mtd->priv		= chip;
 	mtd->name		= "gpmi-nand";
-	mtd->owner		= THIS_MODULE;
+	mtd->dev.parent		= this->dev;
 
 	/* init the nand_chip{}, we don't support a 16-bit NAND Flash bus. */
 	chip->priv		= this;
-- 
2.2.2

[PATCH 36/60] mtd: nand: hisi504_nand: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/hisi504_nand.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
index 289ad3a..331f63a 100644
--- a/drivers/mtd/nand/hisi504_nand.c
+++ b/drivers/mtd/nand/hisi504_nand.c
@@ -737,7 +737,6 @@ static int hisi_nfc_probe(struct platform_device *pdev)
 	}
 
 	mtd->priv		= chip;
-	mtd->owner		= THIS_MODULE;
 	mtd->name		= "hisi_nand";
 	mtd->dev.parent         = &pdev->dev;
 
-- 
2.2.2

[PATCH 37/60] mtd: nand: jz4740_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/jz4740_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index ebf2cce..dc4e844 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -434,7 +434,7 @@ static int jz_nand_probe(struct platform_device *pdev)
 	mtd		= &nand->mtd;
 	chip		= &nand->chip;
 	mtd->priv	= chip;
-	mtd->owner	= THIS_MODULE;
+	mtd->dev.parent = &pdev->dev;
 	mtd->name	= "jz4740-nand";
 
 	chip->ecc.hwctl		= jz_nand_hwctl;
-- 
2.2.2

[PATCH 38/60] mtd: nand: lpc32xx_mlc: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/lpc32xx_mlc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 79c3b78..65b7e03 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -682,7 +682,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
 
 	nand_chip->priv = host;		/* link the private data structures */
 	mtd->priv = nand_chip;
-	mtd->owner = THIS_MODULE;
 	mtd->dev.parent = &pdev->dev;
 
 	/* Get NAND clock */
-- 
2.2.2

[PATCH 39/60] mtd: nand: mpc5121_nfc: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/mpc5121_nfc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 1f12e5b..b97c371 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -659,6 +659,7 @@ static int mpc5121_nfc_probe(struct platform_device *op)
 	chip = &prv->chip;
 
 	mtd->priv = chip;
+	mtd->dev.parent = dev;
 	chip->priv = prv;
 	prv->dev = dev;
 
-- 
2.2.2

[PATCH 40/60] mtd: nand: mxc_nand: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/mxc_nand.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index a8f550f..a62284c 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1410,7 +1410,6 @@ static int mxcnd_probe(struct platform_device *pdev)
 	this = &host->nand;
 	mtd = &host->mtd;
 	mtd->priv = this;
-	mtd->owner = THIS_MODULE;
 	mtd->dev.parent = &pdev->dev;
 	mtd->name = DRIVER_NAME;
 
-- 
2.2.2

[PATCH 41/60] mtd: nand: ndfc: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/ndfc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 3187c6b..9c3f6c8 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -171,7 +171,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
 	chip->priv = ndfc;
 
 	ndfc->mtd.priv = chip;
-	ndfc->mtd.owner = THIS_MODULE;
+	ndfc->mtd.dev.parent = &ndfc->ofdev->dev;
 
 	flash_np = of_get_next_child(node, NULL);
 	if (!flash_np)
-- 
2.2.2

[PATCH 42/60] mtd: nand: nuc900_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/nuc900_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index e58c644..f0687f7 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -250,7 +250,7 @@ static int nuc900_nand_probe(struct platform_device *pdev)
 	chip = &(nuc900_nand->chip);
 
 	nuc900_nand->mtd.priv	= chip;
-	nuc900_nand->mtd.owner	= THIS_MODULE;
+	nuc900_nand->mtd.dev.parent = &pdev->dev;
 	spin_lock_init(&nuc900_nand->lock);
 
 	nuc900_nand->clk = devm_clk_get(&pdev->dev, NULL);
-- 
2.2.2

[PATCH 43/60] mtd: nand: omap2: show device structure in sysfs

[Frans Klaver]

Make sure the device structure is properly shown in sysfs by properly
filling in dev.parent.

While at it, make use of the default owner and name values set by
mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/omap2.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 60fa899..7fbf009 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1684,8 +1684,7 @@ static int omap_nand_probe(struct platform_device *pdev)
 	info->ecc_opt		= pdata->ecc_opt;
 	mtd			= &info->mtd;
 	mtd->priv		= &info->nand;
-	mtd->name		= dev_name(&pdev->dev);
-	mtd->owner		= THIS_MODULE;
+	mtd->dev.parent		= &pdev->dev;
 	nand_chip		= &info->nand;
 	nand_chip->ecc.priv	= NULL;
 
-- 
2.2.2

[PATCH 44/60] mtd: nand: orion_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/orion_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index c3c6d30..81897ef 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -124,7 +124,7 @@ static int __init orion_nand_probe(struct platform_device *pdev)
 	}
 
 	mtd->priv = nc;
-	mtd->owner = THIS_MODULE;
+	mtd->dev.parent = &pdev->dev;
 
 	nc->priv = board;
 	nc->IO_ADDR_R = nc->IO_ADDR_W = io_base;
-- 
2.2.2

[PATCH 45/60] mtd: nand: pasemi_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/pasemi_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 66c345b..83cf021 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -124,7 +124,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev)
 
 	/* Link the private data with the MTD structure */
 	pasemi_nand_mtd->priv = chip;
-	pasemi_nand_mtd->owner = THIS_MODULE;
+	pasemi_nand_mtd->dev.parent = &ofdev->dev;
 
 	chip->IO_ADDR_R = of_iomap(np, 0);
 	chip->IO_ADDR_W = chip->IO_ADDR_R;
-- 
2.2.2

[PATCH 46/60] mtd: nand: plat_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner and name set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/plat_nand.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 4535c26..72e321e 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -61,8 +61,7 @@ static int plat_nand_probe(struct platform_device *pdev)
 
 	data->chip.priv = &data;
 	data->mtd.priv = &data->chip;
-	data->mtd.owner = THIS_MODULE;
-	data->mtd.name = dev_name(&pdev->dev);
+	data->mtd.dev.parent = &pdev->dev;
 
 	data->chip.IO_ADDR_R = data->io_base;
 	data->chip.IO_ADDR_W = data->io_base;
-- 
2.2.2

[PATCH 47/60] mtd: nand: pxa3xx_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/pxa3xx_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 96b0b1d..f908c6d 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1589,7 +1589,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
 		host->cs = cs;
 		host->info_data = info;
 		mtd->priv = host;
-		mtd->owner = THIS_MODULE;
+		mtd->dev.parent = &pdev->dev;
 
 		chip->ecc.read_page	= pxa3xx_nand_read_page_hwecc;
 		chip->ecc.write_page	= pxa3xx_nand_write_page_hwecc;
-- 
2.2.2

[PATCH 48/60] mtd: nand: r852: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/r852.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index baea83f..2541a94 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -641,7 +641,6 @@ static int r852_register_nand_device(struct r852_device *dev)
 
 	WARN_ON(dev->card_registred);
 
-	dev->mtd->owner = THIS_MODULE;
 	dev->mtd->priv = dev->chip;
 	dev->mtd->dev.parent = &dev->pci_dev->dev;
 
-- 
2.2.2

[PATCH 49/60] mtd: nand: s3c2410: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/s3c2410.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 35aef5e..6db6126 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -832,7 +832,6 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
 
 	nmtd->info	   = info;
 	nmtd->mtd.priv	   = chip;
-	nmtd->mtd.owner    = THIS_MODULE;
 	nmtd->set	   = set;
 
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
@@ -1018,6 +1017,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
 		pr_debug("initialising set %d (%p, info %p)\n",
 			 setno, nmtd, info);
 
+		nmtd->mtd.dev.parent = &pdev->dev;
 		s3c2410_nand_init_chip(info, nmtd, sets);
 
 		nmtd->scan_res = nand_scan_ident(&nmtd->mtd,
-- 
2.2.2

[PATCH 50/60] mtd: nand: sh_flctl: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/sh_flctl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index a21c378..19135b4 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -1125,6 +1125,7 @@ static int flctl_probe(struct platform_device *pdev)
 	flctl_mtd = &flctl->mtd;
 	nand = &flctl->chip;
 	flctl_mtd->priv = nand;
+	flctl_mtd->dev.parent = &pdev->dev;
 	flctl->pdev = pdev;
 	flctl->hwecc = pdata->has_hwecc;
 	flctl->holden = pdata->use_holden;
-- 
2.2.2

[PATCH 51/60] mtd: nand: sharpsl: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/sharpsl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 842c47a..082b600 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -144,7 +144,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev)
 
 	/* Link the private data with the MTD structure */
 	sharpsl->mtd.priv = this;
-	sharpsl->mtd.owner = THIS_MODULE;
+	sharpsl->mtd.dev.parent = &pdev->dev;
 
 	platform_set_drvdata(pdev, sharpsl);
 
-- 
2.2.2

[PATCH 52/60] mtd: nand: socrates_nand: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/socrates_nand.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index d710622..b94f534 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -167,7 +167,6 @@ static int socrates_nand_probe(struct platform_device *ofdev)
 	nand_chip->priv = host;		/* link the private data structures */
 	mtd->priv = nand_chip;
 	mtd->name = "socrates_nand";
-	mtd->owner = THIS_MODULE;
 	mtd->dev.parent = &ofdev->dev;
 	ppdata.of_node = ofdev->dev.of_node;
 
-- 
2.2.2

[PATCH 53/60] mtd: nand: sunxi_nand: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/sunxi_nand.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 6f93b29..14f5c50 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -1245,7 +1245,6 @@ static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc,
 	mtd = &chip->mtd;
 	mtd->dev.parent = dev;
 	mtd->priv = nand;
-	mtd->owner = THIS_MODULE;
 
 	ret = nand_scan_ident(mtd, nsels, NULL);
 	if (ret)
-- 
2.2.2

[PATCH 54/60] mtd: nand: tmio_nand: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/tmio_nand.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index fb8fd35..befddf0 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -382,6 +382,7 @@ static int tmio_probe(struct platform_device *dev)
 	nand_chip = &tmio->chip;
 	mtd->priv = nand_chip;
 	mtd->name = "tmio-nand";
+	mtd->dev.parent = &dev->dev;
 
 	tmio->ccr = devm_ioremap(&dev->dev, ccr->start, resource_size(ccr));
 	if (!tmio->ccr)
-- 
2.2.2

[PATCH 55/60] mtd: nand: txx9ndfmc: show device in sysfs

[Frans Klaver]

Fix a bug where devices aren't shown in sysfs.

While at it, make use of the default owner value set by mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/nand/txx9ndfmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 9c0bc45..8572519 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -323,7 +323,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
 			continue;
 		chip = &txx9_priv->chip;
 		mtd = &txx9_priv->mtd;
-		mtd->owner = THIS_MODULE;
+		mtd->dev.parent = &dev->dev;
 
 		mtd->priv = chip;
 
-- 
2.2.2

[PATCH 56/60] mtd: onenand: generic: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, take advantage of the default owner and name values set by
mtdcore.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/onenand/generic.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index 32a216d..9ed801b 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -60,9 +60,8 @@ static int generic_onenand_probe(struct platform_device *pdev)
 	info->onenand.mmcontrol = pdata ? pdata->mmcontrol : NULL;
 	info->onenand.irq = platform_get_irq(pdev, 0);
 
-	info->mtd.name = dev_name(&pdev->dev);
+	info->mtd.dev.parent = &pdev->dev;
 	info->mtd.priv = &info->onenand;
-	info->mtd.owner = THIS_MODULE;
 
 	if (onenand_scan(&info->mtd, 1)) {
 		err = -ENXIO;
-- 
2.2.2

[PATCH 57/60] mtd: onenand: omap2: drop owner and name assignment

[Frans Klaver]

Owner and name are automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/onenand/omap2.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 646ddd6..3e02856 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -710,9 +710,7 @@ static int omap2_onenand_probe(struct platform_device *pdev)
 		 c->onenand.base, c->freq);
 
 	c->pdev = pdev;
-	c->mtd.name = dev_name(&pdev->dev);
 	c->mtd.priv = &c->onenand;
-	c->mtd.owner = THIS_MODULE;
 
 	c->mtd.dev.parent = &pdev->dev;
 
-- 
2.2.2

[PATCH 58/60] mtd: onenand: samsung: drop owner assignment

[Frans Klaver]

Owner is automatically set by mtdcore. Make use of that.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/onenand/samsung.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 19cfb97..5685923 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -864,7 +864,6 @@ static int s3c_onenand_probe(struct platform_device *pdev)
 	this = (struct onenand_chip *) &mtd[1];
 	mtd->priv = this;
 	mtd->dev.parent = &pdev->dev;
-	mtd->owner = THIS_MODULE;
 	onenand->pdev = pdev;
 	onenand->type = platform_get_device_id(pdev)->driver_data;
 
-- 
2.2.2

[PATCH 59/60] mtd: spi-nor: fsl-quadspi: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/mtd/spi-nor/fsl-quadspi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 1c7308c..91b9d3f 100644
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -875,6 +875,7 @@ static int fsl_qspi_probe(struct platform_device *pdev)
 
 		nor = &q->nor[i];
 		mtd = &q->mtd[i];
+		mtd->dev.parent = dev;
 
 		nor->mtd = mtd;
 		nor->dev = dev;
-- 
2.2.2

[PATCH 60/60] staging: mt29f_spinand: show device in sysfs

[Frans Klaver]

Fix a bug where mtd devices aren't shown in sysfs.

While at it, take advantage of the default owner and name values set by
mtdcore.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
 drivers/staging/mt29f_spinand/mt29f_spinand.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
index 3b191fc..b672b0b 100644
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -912,8 +912,7 @@ static int spinand_probe(struct spi_device *spi_nand)
 	dev_set_drvdata(&spi_nand->dev, mtd);
 
 	mtd->priv = chip;
-	mtd->name = dev_name(&spi_nand->dev);
-	mtd->owner = THIS_MODULE;
+	mtd->dev.parent = &spi_nand->dev;
 	mtd->oobsize = 64;
 
 	if (nand_scan(mtd, 1))
-- 
2.2.2

Re: [PATCH 60/60] staging: mt29f_spinand: show device in sysfs

[Greg Kroah-Hartman]

On Tue, Mar 03, 2015 at 10:40:44PM +0100, Frans Klaver wrote:
> Fix a bug where mtd devices aren't shown in sysfs.
> 
> While at it, take advantage of the default owner and name values set by
> mtdcore.
> 
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Frans Klaver <fransklaver@gmail.com>
> ---
>  drivers/staging/mt29f_spinand/mt29f_spinand.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH 01/60] mtd: core: tone down suggestion that dev.parent should be set

[Brian Norris]

On Tue, Mar 03, 2015 at 10:39:45PM +0100, Frans Klaver wrote:
> add_mtd_device() has a comment suggesting that the caller should have
> set dev.parent. This is required to have the device show up in sysfs,

What do you mean "have the device show up in sysfs"? AFAICT, this only
has bearing on whether the *parent* device shows up as a sysfs symlink
within the MTD device directory. i.e.:

   /sys/class/mtd/mtd*/device

For instance, this sort of symlink:

   /sys/class/mtd/mtd0/device -> ../../../f03e2800.nand

It might be good to clarify this in the commit message, since you make
the problem sound worse than (I think) it is.

Brian

> but not for proper operation of the mtd device itself. Currently we have
> five drivers registering mtd devices during module initialization, so
> they don't actually provide a parent device to link to. That means we
> cannot WARN_ON() here, as it would trigger false positives.
> 
> Make the comment a bit less firm in its assertion that dev.parent should
> be set.
> 
> Signed-off-by: Frans Klaver <fransklaver@gmail.com>
> ---
>  drivers/mtd/mtdcore.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> index 11883bd..2093676 100644
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@ -422,7 +422,7 @@ int add_mtd_device(struct mtd_info *mtd)
>  	}
>  
>  	/* Caller should have set dev.parent to match the
> -	 * physical device.
> +	 * physical device, if appropriate.
>  	 */
>  	mtd->dev.type = &mtd_devtype;
>  	mtd->dev.class = &mtd_class;
> -- 
> 2.2.2
> 

Re: [PATCH 30/60] mtd: nand: fsl_elbc_nand: show device in sysfs

[Brian Norris]

On Tue, Mar 03, 2015 at 10:40:14PM +0100, Frans Klaver wrote:
> Fix a bug where devices aren't shown in sysfs.
> 
> While at it, make use of the default owner value set by mtdcore.
> 
> Signed-off-by: Frans Klaver <fransklaver@gmail.com>
> ---
>  drivers/mtd/nand/fsl_elbc_nand.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
> index 04b22fd..0cd94a1 100644
> --- a/drivers/mtd/nand/fsl_elbc_nand.c
> +++ b/drivers/mtd/nand/fsl_elbc_nand.c
> @@ -747,7 +747,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
>  
>  	/* Fill in fsl_elbc_mtd structure */
>  	priv->mtd.priv = chip;
> -	priv->mtd.owner = THIS_MODULE;
> +	priv->mtd.dev.parent = &chip->dev;

drivers/mtd/nand/fsl_elbc_nand.c: In function 'fsl_elbc_chip_init':
drivers/mtd/nand/fsl_elbc_nand.c:750:30: error: 'struct nand_chip' has no member named 'dev'
make[4]: *** [drivers/mtd/nand/fsl_elbc_nand.o] Error 1

>  
>  	/* set timeout to maximum */
>  	priv->fmr = 15 << FMR_CWTO_SHIFT;
> -- 
> 2.2.2
> 

Re: [PATCH 30/60] mtd: nand: fsl_elbc_nand: show device in sysfs

[Frans Klaver]

On Tue, Mar 10, 2015 at 7:28 AM, Brian Norris
<computersforpeace@gmail.com> wrote:
> On Tue, Mar 03, 2015 at 10:40:14PM +0100, Frans Klaver wrote:
>> Fix a bug where devices aren't shown in sysfs.
>>
>> While at it, make use of the default owner value set by mtdcore.
>>
>> Signed-off-by: Frans Klaver <fransklaver@gmail.com>
>> ---
>>  drivers/mtd/nand/fsl_elbc_nand.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
>> index 04b22fd..0cd94a1 100644
>> --- a/drivers/mtd/nand/fsl_elbc_nand.c
>> +++ b/drivers/mtd/nand/fsl_elbc_nand.c
>> @@ -747,7 +747,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
>>
>>       /* Fill in fsl_elbc_mtd structure */
>>       priv->mtd.priv = chip;
>> -     priv->mtd.owner = THIS_MODULE;
>> +     priv->mtd.dev.parent = &chip->dev;
>
> drivers/mtd/nand/fsl_elbc_nand.c: In function 'fsl_elbc_chip_init':
> drivers/mtd/nand/fsl_elbc_nand.c:750:30: error: 'struct nand_chip' has no member named 'dev'
> make[4]: *** [drivers/mtd/nand/fsl_elbc_nand.o] Error 1

Thanks for building this. I thought this might happen even though I
spent quite some time trying to prevent it. This should probably have
been

+ priv->mtd.dev.parent = priv->dev;

Off to go find out what other configs & targets to build for.

Thanks,
Frans

Re: [PATCH 01/60] mtd: core: tone down suggestion that dev.parent should be set

[Frans Klaver]

On Tue, Mar 10, 2015 at 12:14 AM, Brian Norris
<computersforpeace@gmail.com> wrote:
> On Tue, Mar 03, 2015 at 10:39:45PM +0100, Frans Klaver wrote:
>> add_mtd_device() has a comment suggesting that the caller should have
>> set dev.parent. This is required to have the device show up in sysfs,
>
> What do you mean "have the device show up in sysfs"? AFAICT, this only
> has bearing on whether the *parent* device shows up as a sysfs symlink
> within the MTD device directory. i.e.:
>
>    /sys/class/mtd/mtd*/device
>
> For instance, this sort of symlink:
>
>    /sys/class/mtd/mtd0/device -> ../../../f03e2800.nand
>
> It might be good to clarify this in the commit message, since you make
> the problem sound worse than (I think) it is.

I do? That was definitely not my intention. I'll look into it.

Thanks,
Frans

Re: [PATCH 01/60] mtd: core: tone down suggestion that dev.parent should be set

[Brian Norris]

On Tue, Mar 10, 2015 at 08:47:46AM +0100, Frans Klaver wrote:
> On Tue, Mar 10, 2015 at 12:14 AM, Brian Norris
> <computersforpeace@gmail.com> wrote:
> > On Tue, Mar 03, 2015 at 10:39:45PM +0100, Frans Klaver wrote:
> >> add_mtd_device() has a comment suggesting that the caller should have
> >> set dev.parent. This is required to have the device show up in sysfs,
> >
> > What do you mean "have the device show up in sysfs"? AFAICT, this only
> > has bearing on whether the *parent* device shows up as a sysfs symlink
> > within the MTD device directory. i.e.:
> >
> >    /sys/class/mtd/mtd*/device
> >
> > For instance, this sort of symlink:
> >
> >    /sys/class/mtd/mtd0/device -> ../../../f03e2800.nand
> >
> > It might be good to clarify this in the commit message, since you make
> > the problem sound worse than (I think) it is.
> 
> I do? That was definitely not my intention. I'll look into it.

Maybe it's just my bias when reading, since some people have complained
loudly about this, seemingly without understanding that the problem
really isn't that significant.

So my question was really just to confirm my own understanding, that
this only affects the 'device' symlink.

BTW, it'd be nice if you don't respam with another 60 patches, if you're
only changing a few of them. I can probably take most of them as-is,
after you confirm there are no more compile failures.

Thanks,
Brian

Re: [PATCH 01/60] mtd: core: tone down suggestion that dev.parent should be set

[Frans Klaver]

On Tue, Mar 10, 2015 at 6:39 PM, Brian Norris
<computersforpeace@gmail.com> wrote:
> On Tue, Mar 10, 2015 at 08:47:46AM +0100, Frans Klaver wrote:
>> On Tue, Mar 10, 2015 at 12:14 AM, Brian Norris
>> <computersforpeace@gmail.com> wrote:
>> > On Tue, Mar 03, 2015 at 10:39:45PM +0100, Frans Klaver wrote:
>> >> add_mtd_device() has a comment suggesting that the caller should have
>> >> set dev.parent. This is required to have the device show up in sysfs,
>> >
>> > What do you mean "have the device show up in sysfs"? AFAICT, this only
>> > has bearing on whether the *parent* device shows up as a sysfs symlink
>> > within the MTD device directory. i.e.:
>> >
>> >    /sys/class/mtd/mtd*/device
>> >
>> > For instance, this sort of symlink:
>> >
>> >    /sys/class/mtd/mtd0/device -> ../../../f03e2800.nand
>> >
>> > It might be good to clarify this in the commit message, since you make
>> > the problem sound worse than (I think) it is.
>>
>> I do? That was definitely not my intention. I'll look into it.
>
> Maybe it's just my bias when reading, since some people have complained
> loudly about this, seemingly without understanding that the problem
> really isn't that significant.
>
> So my question was really just to confirm my own understanding, that
> this only affects the 'device' symlink.

Ah right. I'll double check and reword where necessary. I already had
the feeling that this wasn't very significant, as there weren't any
real issues related to this using these drivers.

> BTW, it'd be nice if you don't respam with another 60 patches, if you're
> only changing a few of them. I can probably take most of them as-is,
> after you confirm there are no more compile failures.

Sure thing, I thought as much.

Thanks,
Frans

Re: [PATCH 01/60] mtd: core: tone down suggestion that dev.parent should be set

[Brian Norris]

On Wed, Mar 11, 2015 at 09:03:46AM +0100, Frans Klaver wrote:
> On Tue, Mar 10, 2015 at 6:39 PM, Brian Norris
> <computersforpeace@gmail.com> wrote:
> > On Tue, Mar 10, 2015 at 08:47:46AM +0100, Frans Klaver wrote:
> >> On Tue, Mar 10, 2015 at 12:14 AM, Brian Norris
> >> <computersforpeace@gmail.com> wrote:
> >> > On Tue, Mar 03, 2015 at 10:39:45PM +0100, Frans Klaver wrote:
> >> >> add_mtd_device() has a comment suggesting that the caller should have
> >> >> set dev.parent. This is required to have the device show up in sysfs,
> >> >
> >> > What do you mean "have the device show up in sysfs"? AFAICT, this only
> >> > has bearing on whether the *parent* device shows up as a sysfs symlink
> >> > within the MTD device directory. i.e.:
> >> >
> >> >    /sys/class/mtd/mtd*/device
> >> >
> >> > For instance, this sort of symlink:
> >> >
> >> >    /sys/class/mtd/mtd0/device -> ../../../f03e2800.nand
> >> >
> >> > It might be good to clarify this in the commit message, since you make
> >> > the problem sound worse than (I think) it is.
> >>
> >> I do? That was definitely not my intention. I'll look into it.
> >
> > Maybe it's just my bias when reading, since some people have complained
> > loudly about this, seemingly without understanding that the problem
> > really isn't that significant.
> >
> > So my question was really just to confirm my own understanding, that
> > this only affects the 'device' symlink.
> 
> Ah right. I'll double check and reword where necessary. I already had
> the feeling that this wasn't very significant, as there weren't any
> real issues related to this using these drivers.

OK, I just made some small edits to the language to clarify that this
patch is only fixing the 'parent device symlink' rather than the 'device
is missing in sysfs'. I also tweaked the language on all the other
patches to reflect this.

> > BTW, it'd be nice if you don't respam with another 60 patches, if you're
> > only changing a few of them. I can probably take most of them as-is,
> > after you confirm there are no more compile failures.
> 
> Sure thing, I thought as much.

I ran the other 59 patches through a pretty wide range of compile tests
and saw no issues, so I've pushed patches 1-29 and 31-60 to l2-mtd.git,
with small tweaks to the commit descriptions. If you get a chance to
rework patch 30, feel free.

Thanks for the patches!

Brian

Re: [PATCH 01/60] mtd: core: tone down suggestion that dev.parent should be set

[Frans Klaver]

On 10 April 2015 06:30:00 CEST, Brian Norris <computersforpeace@gmail.com> wrote:

>OK, I just made some small edits to the language to clarify that this
>patch is only fixing the 'parent device symlink' rather than the
>'device
>is missing in sysfs'. I also tweaked the language on all the other
>patches to reflect this.

Alright. 

>I ran the other 59 patches through a pretty wide range of compile tests
>and saw no issues, so I've pushed patches 1-29 and 31-60 to l2-mtd.git,
>with small tweaks to the commit descriptions. If you get a chance to
>rework patch 30, feel free.

I was in the process of checking this, until a hd failure threw me off track.
I'll be able to send a reworked 30 after the weekend. 

>Thanks for the patches!

Thanks for testing and rewording, 
Frans 

Re: [PATCH 02/60] mtd: core: set some defaults when dev.parent is set

[Frans Klaver]

On Tue, Mar 3, 2015 at 10:39 PM, Frans Klaver <fransklaver@gmail.com> wrote:
> If a parent device is set, add_mtd_device() has enough knowledge to fill
> in some sane default values for the module name and owner. Do so if they
> aren't already set.
>
> Signed-off-by: Frans Klaver <fransklaver@gmail.com>
> ---
>  drivers/mtd/mtdcore.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> index 2093676..487e467 100644
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@ -412,6 +412,15 @@ int add_mtd_device(struct mtd_info *mtd)
>         mtd->erasesize_mask = (1 << mtd->erasesize_shift) - 1;
>         mtd->writesize_mask = (1 << mtd->writesize_shift) - 1;
>
> +       if (mtd->dev.parent) {
> +               if (!mtd->owner)
> +                       mtd->owner = mtd->dev.parent->driver->owner;

Turns out that driver pointer is not guaranteed to be set. I don't
have the overview on whether this is something that only occurs with
nandsim, or whether it is possible to have an actual device without a
driver.

It is of course easy to prevent the NULL dereference, but that does
mean the requirement for owner becomes slightly more complex than
"only necessary if you don't have a parent device". Unless someone has
objections, I'll probably resend the series with this bit looking more
like

+ if (mtd->dev.parent) {
+        if (!mtd->owner && mtd->dev.parent->driver)
+                mtd->owner = ...

Nandsim seems to not have any issues with this.The drivers I've
changed to rely on this seem to all have driver set.

Thanks,
Frans