mtd: add leading underscore to all mtd functions

This patch renames all MTD functions by adding a "_" prefix:

mtd->erase -> mtd->_erase
mtd->read_oob -> mtd->_read_oob
...

The reason is that we are re-working the MTD API and from now on it is
an error to use MTD function pointers directly - we have a corresponding
API call for every pointer. By adding a leading "_" we achieve the following:

1. Make sure we convert every direct pointer users
2. A leading "_" suggests that this interface is internal and it becomes
   less likely that people will use them directly
3. Make sure all the out-of-tree modules stop compiling and the owners
   spot the big API change and amend them.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

15 files changed, 70 insertions, 70 deletions

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index e7e46d1e7463..d9e75dafdd45 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -285,11 +285,11 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
         dev->mtd.writesize = 1;
         dev->mtd.type = MTD_RAM;
         dev->mtd.flags = MTD_CAP_RAM;
-        dev->mtd.erase = block2mtd_erase;
-        dev->mtd.write = block2mtd_write;
-        dev->mtd.writev = mtd_writev;
-        dev->mtd.sync = block2mtd_sync;
-        dev->mtd.read = block2mtd_read;
+        dev->mtd._erase = block2mtd_erase;
+        dev->mtd._write = block2mtd_write;
+        dev->mtd._writev = mtd_writev;
+        dev->mtd._sync = block2mtd_sync;
+        dev->mtd._read = block2mtd_read;
         dev->mtd.priv = dev;
         dev->mtd.owner = THIS_MODULE;
 
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index b1cdf6479019..ffd01a66a175 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -565,11 +565,11 @@ void DoC2k_init(struct mtd_info *mtd)
         mtd->writesize = 512;
         mtd->oobsize = 16;
         mtd->owner = THIS_MODULE;
-        mtd->erase = doc_erase;
-        mtd->read = doc_read;
-        mtd->write = doc_write;
-        mtd->read_oob = doc_read_oob;
-        mtd->write_oob = doc_write_oob;
+        mtd->_erase = doc_erase;
+        mtd->_read = doc_read;
+        mtd->_write = doc_write;
+        mtd->_read_oob = doc_read_oob;
+        mtd->_write_oob = doc_write_oob;
         this->curfloor = -1;
         this->curchip = -1;
         mutex_init(&this->lock);
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 7543b98f46c4..3785733650cb 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -349,11 +349,11 @@ void DoCMil_init(struct mtd_info *mtd)
         mtd->writesize = 512;
         mtd->oobsize = 16;
         mtd->owner = THIS_MODULE;
-        mtd->erase = doc_erase;
-        mtd->read = doc_read;
-        mtd->write = doc_write;
-        mtd->read_oob = doc_read_oob;
-        mtd->write_oob = doc_write_oob;
+        mtd->_erase = doc_erase;
+        mtd->_read = doc_read;
+        mtd->_write = doc_write;
+        mtd->_read_oob = doc_read_oob;
+        mtd->_write_oob = doc_write_oob;
         this->curfloor = -1;
         this->curchip = -1;
 
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 177510d0e7ee..409fa3174cc4 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -470,11 +470,11 @@ void DoCMilPlus_init(struct mtd_info *mtd)
         mtd->writesize = 512;
         mtd->oobsize = 16;
         mtd->owner = THIS_MODULE;
-        mtd->erase = doc_erase;
-        mtd->read = doc_read;
-        mtd->write = doc_write;
-        mtd->read_oob = doc_read_oob;
-        mtd->write_oob = doc_write_oob;
+        mtd->_erase = doc_erase;
+        mtd->_read = doc_read;
+        mtd->_write = doc_write;
+        mtd->_read_oob = doc_read_oob;
+        mtd->_write_oob = doc_write_oob;
         this->curfloor = -1;
         this->curchip = -1;
 
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index ad11ef0a81f4..3746ae8ff0a2 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1820,12 +1820,12 @@ static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
         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;
-        mtd->read_oob = doc_read_oob;
-        mtd->write_oob = doc_write_oob;
-        mtd->block_isbad = doc_block_isbad;
+        mtd->_erase = doc_erase;
+        mtd->_read = doc_read;
+        mtd->_write = doc_write;
+        mtd->_read_oob = doc_read_oob;
+        mtd->_write_oob = doc_write_oob;
+        mtd->_block_isbad = doc_block_isbad;
         mtd->ecclayout = &docg3_oobinfo;
 }
 
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index 3a11ea628e58..a59584871af5 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -635,9 +635,9 @@ static int __init lart_flash_init (void)
    mtd.erasesize = FLASH_BLOCKSIZE_MAIN;
    mtd.numeraseregions = ARRAY_SIZE(erase_regions);
    mtd.eraseregions = erase_regions;
-   mtd.erase = flash_erase;
-   mtd.read = flash_read;
-   mtd.write = flash_write;
+   mtd._erase = flash_erase;
+   mtd._read = flash_read;
+   mtd._write = flash_write;
    mtd.owner = THIS_MODULE;
 
 #ifdef LART_DEBUG
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 230b02e336ab..f83e4d0366cc 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -908,14 +908,14 @@ static int __devinit m25p_probe(struct spi_device *spi)
         flash->mtd.writesize = 1;
         flash->mtd.flags = MTD_CAP_NORFLASH;
         flash->mtd.size = info->sector_size * info->n_sectors;
-        flash->mtd.erase = m25p80_erase;
-        flash->mtd.read = m25p80_read;
+        flash->mtd._erase = m25p80_erase;
+        flash->mtd._read = m25p80_read;
 
         /* sst flash chips use AAI word program */
         if (JEDEC_MFR(info->jedec_id) == CFI_MFR_SST)
-                flash->mtd.write = sst_write;
+                flash->mtd._write = sst_write;
         else
-                flash->mtd.write = m25p80_write;
+                flash->mtd._write = m25p80_write;
 
         /* prefer "small sector" erase if possible */
         if (info->flags & SECT_4K) {
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
index 8423fb6d4f26..3a05af529e7d 100644
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
@@ -215,8 +215,8 @@ static int __init ms02nv_init_one(ulong addr)
         mtd->size = fixsize;
         mtd->name = (char *)ms02nv_name;
         mtd->owner = THIS_MODULE;
-        mtd->read = ms02nv_read;
-        mtd->write = ms02nv_write;
+        mtd->_read = ms02nv_read;
+        mtd->_write = ms02nv_write;
         mtd->writesize = 1;
 
         ret = -EIO;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 5ec5fc9fe045..fd4a9fc0d8b8 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -611,16 +611,16 @@ static int dataflash_write_user_otp(struct mtd_info *mtd,
 
 static char *otp_setup(struct mtd_info *device, char revision)
 {
-        device->get_fact_prot_info = dataflash_get_otp_info;
-        device->read_fact_prot_reg = dataflash_read_fact_otp;
-        device->get_user_prot_info = dataflash_get_otp_info;
-        device->read_user_prot_reg = dataflash_read_user_otp;
+        device->_get_fact_prot_info = dataflash_get_otp_info;
+        device->_read_fact_prot_reg = dataflash_read_fact_otp;
+        device->_get_user_prot_info = dataflash_get_otp_info;
+        device->_read_user_prot_reg = dataflash_read_user_otp;
 
         /* rev c parts (at45db321c and at45db1281 only!) use a
          * different write procedure; not (yet?) implemented.
          */
         if (revision > 'c')
-                device->write_user_prot_reg = dataflash_write_user_otp;
+                device->_write_user_prot_reg = dataflash_write_user_otp;
 
         return ", OTP";
 }
@@ -672,9 +672,9 @@ add_dataflash_otp(struct spi_device *spi, char *name,
         device->owner = THIS_MODULE;
         device->type = MTD_DATAFLASH;
         device->flags = MTD_WRITEABLE;
-        device->erase = dataflash_erase;
-        device->read = dataflash_read;
-        device->write = dataflash_write;
+        device->_erase = dataflash_erase;
+        device->_read = dataflash_read;
+        device->_write = dataflash_write;
         device->priv = priv;
 
         device->dev.parent = &spi->dev;
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 2562689ba6b4..91030cfb03b3 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -126,12 +126,12 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
         mtd->priv = mapped_address;
 
         mtd->owner = THIS_MODULE;
-        mtd->erase = ram_erase;
-        mtd->point = ram_point;
-        mtd->unpoint = ram_unpoint;
-        mtd->get_unmapped_area = ram_get_unmapped_area;
-        mtd->read = ram_read;
-        mtd->write = ram_write;
+        mtd->_erase = ram_erase;
+        mtd->_point = ram_point;
+        mtd->_unpoint = ram_unpoint;
+        mtd->_get_unmapped_area = ram_get_unmapped_area;
+        mtd->_read = ram_read;
+        mtd->_write = ram_write;
 
         if (mtd_device_register(mtd, NULL, 0))
                 return -EIO;
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 23423bd00b06..eff2b69864f5 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -142,11 +142,11 @@ static int register_device(char *name, unsigned long start, unsigned long len)
         new->mtd.name = name;
         new->mtd.size = len;
         new->mtd.flags = MTD_CAP_RAM;
-        new->mtd.erase = phram_erase;
-        new->mtd.point = phram_point;
-        new->mtd.unpoint = phram_unpoint;
-        new->mtd.read = phram_read;
-        new->mtd.write = phram_write;
+        new->mtd._erase = phram_erase;
+        new->mtd._point = phram_point;
+        new->mtd._unpoint = phram_unpoint;
+        new->mtd._read = phram_read;
+        new->mtd._write = phram_write;
         new->mtd.owner = THIS_MODULE;
         new->mtd.type = MTD_RAM;
         new->mtd.erasesize = PAGE_SIZE;
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index cfccf6510411..67d22e1cbc0e 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -787,11 +787,11 @@ static int __init init_pmc551(void)
 
                 mtd->size = msize;
                 mtd->flags = MTD_CAP_RAM;
-                mtd->erase = pmc551_erase;
-                mtd->read = pmc551_read;
-                mtd->write = pmc551_write;
-                mtd->point = pmc551_point;
-                mtd->unpoint = pmc551_unpoint;
+                mtd->_erase = pmc551_erase;
+                mtd->_read = pmc551_read;
+                mtd->_write = pmc551_write;
+                mtd->_point = pmc551_point;
+                mtd->_unpoint = pmc551_unpoint;
                 mtd->type = MTD_RAM;
                 mtd->name = "PMC551 RAM board";
                 mtd->erasesize = 0x10000;
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index e585263161b9..cbeb19522bbc 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -200,11 +200,11 @@ static int register_device(char *name, unsigned long start, unsigned long length
         (*curmtd)->mtdinfo->name = name;
         (*curmtd)->mtdinfo->size = length;
         (*curmtd)->mtdinfo->flags = MTD_CAP_RAM;
-        (*curmtd)->mtdinfo->erase = slram_erase;
-        (*curmtd)->mtdinfo->point = slram_point;
-        (*curmtd)->mtdinfo->unpoint = slram_unpoint;
-        (*curmtd)->mtdinfo->read = slram_read;
-        (*curmtd)->mtdinfo->write = slram_write;
+        (*curmtd)->mtdinfo->_erase = slram_erase;
+        (*curmtd)->mtdinfo->_point = slram_point;
+        (*curmtd)->mtdinfo->_unpoint = slram_unpoint;
+        (*curmtd)->mtdinfo->_read = slram_read;
+        (*curmtd)->mtdinfo->_write = slram_write;
         (*curmtd)->mtdinfo->owner = THIS_MODULE;
         (*curmtd)->mtdinfo->type = MTD_RAM;
         (*curmtd)->mtdinfo->erasesize = SLRAM_BLK_SZ;
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 0f0f1ac06493..5f4254254641 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -846,9 +846,9 @@ static int spear_smi_setup_banks(struct platform_device *pdev, u32 bank)
         flash->mtd.erasesize = flash_devices[flash_index].sectorsize;
         flash->page_size = flash_devices[flash_index].pagesize;
         flash->erase_cmd = flash_devices[flash_index].erase_cmd;
-        flash->mtd.erase = spear_mtd_erase;
-        flash->mtd.read = spear_mtd_read;
-        flash->mtd.write = spear_mtd_write;
+        flash->mtd._erase = spear_mtd_erase;
+        flash->mtd._read = spear_mtd_read;
+        flash->mtd._write = spear_mtd_write;
         flash->dev_id = flash_devices[flash_index].device_id;
 
         dev_info(&dev->pdev->dev, "mtd .name=%s .size=%llx(%lluM)\n",
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 196fd95b19d6..a665eba96e7f 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -403,9 +403,9 @@ static int __devinit sst25l_probe(struct spi_device *spi)
         flash->mtd.erasesize    = flash_info->erase_size;
         flash->mtd.writesize    = flash_info->page_size;
         flash->mtd.size         = flash_info->page_size * flash_info->nr_pages;
-        flash->mtd.erase        = sst25l_erase;
-        flash->mtd.read         = sst25l_read;
-        flash->mtd.write        = sst25l_write;
+        flash->mtd._erase       = sst25l_erase;
+        flash->mtd._read                = sst25l_read;
+        flash->mtd._write       = sst25l_write;
 
         dev_info(&spi->dev, "%s (%lld KiB)\n", flash_info->name,
                  (long long)flash->mtd.size >> 10);