aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/mtdconcat.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-01-30 07:58:32 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-03-26 19:20:01 -0400
commit3c3c10bba1e4ccb75b41442e45c1a072f6cded19 (patch)
tree5c929e46cd0b6fcf8a42db7637cf45dbf69fe126 /drivers/mtd/mtdconcat.c
parenta6c22850d20273896e7c8ee996730ccf2ba60a22 (diff)
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>
Diffstat (limited to 'drivers/mtd/mtdconcat.c')
-rw-r--r--drivers/mtd/mtdconcat.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 1ed5103b219b..5c7eb69c4ed9 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -777,16 +777,16 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c
777 concat->mtd.subpage_sft = subdev[0]->subpage_sft; 777 concat->mtd.subpage_sft = subdev[0]->subpage_sft;
778 concat->mtd.oobsize = subdev[0]->oobsize; 778 concat->mtd.oobsize = subdev[0]->oobsize;
779 concat->mtd.oobavail = subdev[0]->oobavail; 779 concat->mtd.oobavail = subdev[0]->oobavail;
780 if (subdev[0]->writev) 780 if (subdev[0]->_writev)
781 concat->mtd.writev = concat_writev; 781 concat->mtd._writev = concat_writev;
782 if (subdev[0]->read_oob) 782 if (subdev[0]->_read_oob)
783 concat->mtd.read_oob = concat_read_oob; 783 concat->mtd._read_oob = concat_read_oob;
784 if (subdev[0]->write_oob) 784 if (subdev[0]->_write_oob)
785 concat->mtd.write_oob = concat_write_oob; 785 concat->mtd._write_oob = concat_write_oob;
786 if (subdev[0]->block_isbad) 786 if (subdev[0]->_block_isbad)
787 concat->mtd.block_isbad = concat_block_isbad; 787 concat->mtd._block_isbad = concat_block_isbad;
788 if (subdev[0]->block_markbad) 788 if (subdev[0]->_block_markbad)
789 concat->mtd.block_markbad = concat_block_markbad; 789 concat->mtd._block_markbad = concat_block_markbad;
790 790
791 concat->mtd.ecc_stats.badblocks = subdev[0]->ecc_stats.badblocks; 791 concat->mtd.ecc_stats.badblocks = subdev[0]->ecc_stats.badblocks;
792 792
@@ -833,8 +833,8 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c
833 if (concat->mtd.writesize != subdev[i]->writesize || 833 if (concat->mtd.writesize != subdev[i]->writesize ||
834 concat->mtd.subpage_sft != subdev[i]->subpage_sft || 834 concat->mtd.subpage_sft != subdev[i]->subpage_sft ||
835 concat->mtd.oobsize != subdev[i]->oobsize || 835 concat->mtd.oobsize != subdev[i]->oobsize ||
836 !concat->mtd.read_oob != !subdev[i]->read_oob || 836 !concat->mtd._read_oob != !subdev[i]->_read_oob ||
837 !concat->mtd.write_oob != !subdev[i]->write_oob) { 837 !concat->mtd._write_oob != !subdev[i]->_write_oob) {
838 kfree(concat); 838 kfree(concat);
839 printk("Incompatible OOB or ECC data on \"%s\"\n", 839 printk("Incompatible OOB or ECC data on \"%s\"\n",
840 subdev[i]->name); 840 subdev[i]->name);
@@ -849,15 +849,15 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c
849 concat->num_subdev = num_devs; 849 concat->num_subdev = num_devs;
850 concat->mtd.name = name; 850 concat->mtd.name = name;
851 851
852 concat->mtd.erase = concat_erase; 852 concat->mtd._erase = concat_erase;
853 concat->mtd.read = concat_read; 853 concat->mtd._read = concat_read;
854 concat->mtd.write = concat_write; 854 concat->mtd._write = concat_write;
855 concat->mtd.sync = concat_sync; 855 concat->mtd._sync = concat_sync;
856 concat->mtd.lock = concat_lock; 856 concat->mtd._lock = concat_lock;
857 concat->mtd.unlock = concat_unlock; 857 concat->mtd._unlock = concat_unlock;
858 concat->mtd.suspend = concat_suspend; 858 concat->mtd._suspend = concat_suspend;
859 concat->mtd.resume = concat_resume; 859 concat->mtd._resume = concat_resume;
860 concat->mtd.get_unmapped_area = concat_get_unmapped_area; 860 concat->mtd._get_unmapped_area = concat_get_unmapped_area;
861 861
862 /* 862 /*
863 * Combine the erase block size info of the subdevices: 863 * Combine the erase block size info of the subdevices: