aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/m25p80.c4
-rw-r--r--drivers/mtd/devices/mtd_dataflash.c8
-rw-r--r--drivers/mtd/devices/spear_smi.c6
-rw-r--r--drivers/mtd/devices/sst25l.c4
-rw-r--r--drivers/mtd/maps/amd76xrom.c2
-rw-r--r--drivers/mtd/maps/autcpu12-nvram.c2
-rw-r--r--drivers/mtd/maps/bfin-async-flash.c2
-rw-r--r--drivers/mtd/maps/ck804xrom.c2
-rw-r--r--drivers/mtd/maps/esb2rom.c2
-rw-r--r--drivers/mtd/maps/gpio-addr-flash.c2
-rw-r--r--drivers/mtd/maps/ichxrom.c2
-rw-r--r--drivers/mtd/maps/intel_vr_nor.c8
-rw-r--r--drivers/mtd/maps/lantiq-flash.c2
-rw-r--r--drivers/mtd/maps/latch-addr-flash.c2
-rw-r--r--drivers/mtd/maps/pci.c2
-rw-r--r--drivers/mtd/maps/physmap_of.c8
-rw-r--r--drivers/mtd/maps/pismo.c14
-rw-r--r--drivers/mtd/maps/pxa2xx-flash.c2
-rw-r--r--drivers/mtd/maps/sa1100-flash.c5
-rw-r--r--drivers/mtd/maps/scb2_flash.c4
-rw-r--r--drivers/mtd/maps/sun_uflash.c2
-rw-r--r--drivers/mtd/maps/vmu-flash.c4
-rw-r--r--drivers/mtd/nand/ams-delta.c2
-rw-r--r--drivers/mtd/nand/atmel_nand.c12
-rw-r--r--drivers/mtd/nand/au1550nd.c4
-rw-r--r--drivers/mtd/nand/bf5xx_nand.c4
-rw-r--r--drivers/mtd/nand/cafe_nand.c8
-rw-r--r--drivers/mtd/nand/denali_dt.c2
-rw-r--r--drivers/mtd/nand/denali_pci.c2
-rw-r--r--drivers/mtd/nand/fsl_elbc_nand.c2
-rw-r--r--drivers/mtd/nand/fsl_ifc_nand.c2
-rw-r--r--drivers/mtd/nand/fsl_upm.c4
-rw-r--r--drivers/mtd/nand/fsmc_nand.c4
-rw-r--r--drivers/mtd/nand/gpio.c2
-rw-r--r--drivers/mtd/nand/gpmi-nand/gpmi-nand.c16
-rw-r--r--drivers/mtd/nand/jz4740_nand.c4
-rw-r--r--drivers/mtd/nand/lpc32xx_mlc.c2
-rw-r--r--drivers/mtd/nand/lpc32xx_slc.c2
-rw-r--r--drivers/mtd/nand/mpc5121_nfc.c2
-rw-r--r--drivers/mtd/nand/mxc_nand.c2
-rw-r--r--drivers/mtd/nand/ndfc.c2
-rw-r--r--drivers/mtd/nand/nuc900_nand.c2
-rw-r--r--drivers/mtd/nand/omap2.c2
-rw-r--r--drivers/mtd/nand/pasemi_nand.c2
-rw-r--r--drivers/mtd/nand/plat_nand.c2
-rw-r--r--drivers/mtd/nand/sh_flctl.c2
-rw-r--r--drivers/mtd/nand/sharpsl.c2
-rw-r--r--drivers/mtd/nand/socrates_nand.c2
-rw-r--r--drivers/mtd/onenand/generic.c2
-rw-r--r--drivers/mtd/onenand/omap2.c2
50 files changed, 92 insertions, 93 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index bd2d91254c62..ae43b0154003 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -755,7 +755,7 @@ static const struct spi_device_id m25p_ids[] = {
755}; 755};
756MODULE_DEVICE_TABLE(spi, m25p_ids); 756MODULE_DEVICE_TABLE(spi, m25p_ids);
757 757
758static const struct spi_device_id *__devinit jedec_probe(struct spi_device *spi) 758static const struct spi_device_id *jedec_probe(struct spi_device *spi)
759{ 759{
760 int tmp; 760 int tmp;
761 u8 code = OPCODE_RDID; 761 u8 code = OPCODE_RDID;
@@ -800,7 +800,7 @@ static const struct spi_device_id *__devinit jedec_probe(struct spi_device *spi)
800 * matches what the READ command supports, at least until this driver 800 * matches what the READ command supports, at least until this driver
801 * understands FAST_READ (for clocks over 25 MHz). 801 * understands FAST_READ (for clocks over 25 MHz).
802 */ 802 */
803static int __devinit m25p_probe(struct spi_device *spi) 803static int m25p_probe(struct spi_device *spi)
804{ 804{
805 const struct spi_device_id *id = spi_get_device_id(spi); 805 const struct spi_device_id *id = spi_get_device_id(spi);
806 struct flash_platform_data *data; 806 struct flash_platform_data *data;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 23ccc36840f6..080cb1c1887d 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -618,7 +618,7 @@ static char *otp_setup(struct mtd_info *device, char revision)
618/* 618/*
619 * Register DataFlash device with MTD subsystem. 619 * Register DataFlash device with MTD subsystem.
620 */ 620 */
621static int __devinit 621static int
622add_dataflash_otp(struct spi_device *spi, char *name, 622add_dataflash_otp(struct spi_device *spi, char *name,
623 int nr_pages, int pagesize, int pageoffset, char revision) 623 int nr_pages, int pagesize, int pageoffset, char revision)
624{ 624{
@@ -679,7 +679,7 @@ add_dataflash_otp(struct spi_device *spi, char *name,
679 return err; 679 return err;
680} 680}
681 681
682static inline int __devinit 682static inline int
683add_dataflash(struct spi_device *spi, char *name, 683add_dataflash(struct spi_device *spi, char *name,
684 int nr_pages, int pagesize, int pageoffset) 684 int nr_pages, int pagesize, int pageoffset)
685{ 685{
@@ -740,7 +740,7 @@ static struct flash_info __devinitdata dataflash_data [] = {
740 { "at45db642d", 0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS}, 740 { "at45db642d", 0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS},
741}; 741};
742 742
743static struct flash_info *__devinit jedec_probe(struct spi_device *spi) 743static struct flash_info *jedec_probe(struct spi_device *spi)
744{ 744{
745 int tmp; 745 int tmp;
746 uint8_t code = OP_READ_ID; 746 uint8_t code = OP_READ_ID;
@@ -823,7 +823,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
823 * AT45DB0642 64Mbit (8M) xx111xxx (0x3c) 8192 1056 11 823 * AT45DB0642 64Mbit (8M) xx111xxx (0x3c) 8192 1056 11
824 * AT45DB1282 128Mbit (16M) xx0100xx (0x10) 16384 1056 11 824 * AT45DB1282 128Mbit (16M) xx0100xx (0x10) 16384 1056 11
825 */ 825 */
826static int __devinit dataflash_probe(struct spi_device *spi) 826static int dataflash_probe(struct spi_device *spi)
827{ 827{
828 int status; 828 int status;
829 struct flash_info *info; 829 struct flash_info *info;
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index e27737c91212..a30cd27ab916 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -756,7 +756,7 @@ err_probe:
756 756
757 757
758#ifdef CONFIG_OF 758#ifdef CONFIG_OF
759static int __devinit spear_smi_probe_config_dt(struct platform_device *pdev, 759static int spear_smi_probe_config_dt(struct platform_device *pdev,
760 struct device_node *np) 760 struct device_node *np)
761{ 761{
762 struct spear_smi_plat_data *pdata = dev_get_platdata(&pdev->dev); 762 struct spear_smi_plat_data *pdata = dev_get_platdata(&pdev->dev);
@@ -799,7 +799,7 @@ static int __devinit spear_smi_probe_config_dt(struct platform_device *pdev,
799 return 0; 799 return 0;
800} 800}
801#else 801#else
802static int __devinit spear_smi_probe_config_dt(struct platform_device *pdev, 802static int spear_smi_probe_config_dt(struct platform_device *pdev,
803 struct device_node *np) 803 struct device_node *np)
804{ 804{
805 return -ENOSYS; 805 return -ENOSYS;
@@ -901,7 +901,7 @@ static int spear_smi_setup_banks(struct platform_device *pdev,
901 * and do proper init for any found one. 901 * and do proper init for any found one.
902 * Returns 0 on success, non zero otherwise 902 * Returns 0 on success, non zero otherwise
903 */ 903 */
904static int __devinit spear_smi_probe(struct platform_device *pdev) 904static int spear_smi_probe(struct platform_device *pdev)
905{ 905{
906 struct device_node *np = pdev->dev.of_node; 906 struct device_node *np = pdev->dev.of_node;
907 struct spear_smi_plat_data *pdata = NULL; 907 struct spear_smi_plat_data *pdata = NULL;
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 9ebf86d8faa8..ab4154deee0f 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -313,7 +313,7 @@ out:
313 return ret; 313 return ret;
314} 314}
315 315
316static struct flash_info *__devinit sst25l_match_device(struct spi_device *spi) 316static struct flash_info *sst25l_match_device(struct spi_device *spi)
317{ 317{
318 struct flash_info *flash_info = NULL; 318 struct flash_info *flash_info = NULL;
319 struct spi_message m; 319 struct spi_message m;
@@ -353,7 +353,7 @@ static struct flash_info *__devinit sst25l_match_device(struct spi_device *spi)
353 return flash_info; 353 return flash_info;
354} 354}
355 355
356static int __devinit sst25l_probe(struct spi_device *spi) 356static int sst25l_probe(struct spi_device *spi)
357{ 357{
358 struct flash_info *flash_info; 358 struct flash_info *flash_info;
359 struct sst25l_flash *flash; 359 struct sst25l_flash *flash;
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index e2875d6fe129..1a4f671181f4 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -100,7 +100,7 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window)
100} 100}
101 101
102 102
103static int __devinit amd76xrom_init_one (struct pci_dev *pdev, 103static int amd76xrom_init_one (struct pci_dev *pdev,
104 const struct pci_device_id *ent) 104 const struct pci_device_id *ent)
105{ 105{
106 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; 106 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index ca0313db6fea..b8c858913bbe 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -33,7 +33,7 @@ struct autcpu12_nvram_priv {
33 struct map_info map; 33 struct map_info map;
34}; 34};
35 35
36static int __devinit autcpu12_nvram_probe(struct platform_device *pdev) 36static int autcpu12_nvram_probe(struct platform_device *pdev)
37{ 37{
38 map_word tmp, save0, save1; 38 map_word tmp, save0, save1;
39 struct resource *res; 39 struct resource *res;
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 340e8a260547..658a7d06b5eb 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -123,7 +123,7 @@ static void bfin_flash_copy_to(struct map_info *map, unsigned long to, const voi
123 123
124static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; 124static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
125 125
126static int __devinit bfin_flash_probe(struct platform_device *pdev) 126static int bfin_flash_probe(struct platform_device *pdev)
127{ 127{
128 int ret; 128 int ret;
129 struct physmap_flash_data *pdata = pdev->dev.platform_data; 129 struct physmap_flash_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 3d0e762fa5f2..65fedb9f296a 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -112,7 +112,7 @@ static void ck804xrom_cleanup(struct ck804xrom_window *window)
112} 112}
113 113
114 114
115static int __devinit ck804xrom_init_one (struct pci_dev *pdev, 115static int ck804xrom_init_one (struct pci_dev *pdev,
116 const struct pci_device_id *ent) 116 const struct pci_device_id *ent)
117{ 117{
118 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; 118 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index 08322b1c3e81..3797825ab287 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -144,7 +144,7 @@ static void esb2rom_cleanup(struct esb2rom_window *window)
144 pci_dev_put(window->pdev); 144 pci_dev_put(window->pdev);
145} 145}
146 146
147static int __devinit esb2rom_init_one(struct pci_dev *pdev, 147static int esb2rom_init_one(struct pci_dev *pdev,
148 const struct pci_device_id *ent) 148 const struct pci_device_id *ent)
149{ 149{
150 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; 150 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 670af9afa786..9a6a3e153775 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -185,7 +185,7 @@ static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
185 * ... 185 * ...
186 * }; 186 * };
187 */ 187 */
188static int __devinit gpio_flash_probe(struct platform_device *pdev) 188static int gpio_flash_probe(struct platform_device *pdev)
189{ 189{
190 size_t i, arr_size; 190 size_t i, arr_size;
191 struct physmap_flash_data *pdata; 191 struct physmap_flash_data *pdata;
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index 6689dcb3124d..a9bab67d2a87 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -84,7 +84,7 @@ static void ichxrom_cleanup(struct ichxrom_window *window)
84} 84}
85 85
86 86
87static int __devinit ichxrom_init_one (struct pci_dev *pdev, 87static int ichxrom_init_one (struct pci_dev *pdev,
88 const struct pci_device_id *ent) 88 const struct pci_device_id *ent)
89{ 89{
90 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; 90 static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c
index f6185d4c6ba9..1694c03e4884 100644
--- a/drivers/mtd/maps/intel_vr_nor.c
+++ b/drivers/mtd/maps/intel_vr_nor.c
@@ -68,7 +68,7 @@ static void __devexit vr_nor_destroy_partitions(struct vr_nor_mtd *p)
68 mtd_device_unregister(p->info); 68 mtd_device_unregister(p->info);
69} 69}
70 70
71static int __devinit vr_nor_init_partitions(struct vr_nor_mtd *p) 71static int vr_nor_init_partitions(struct vr_nor_mtd *p)
72{ 72{
73 /* register the flash bank */ 73 /* register the flash bank */
74 /* partition the flash bank */ 74 /* partition the flash bank */
@@ -80,7 +80,7 @@ static void __devexit vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p)
80 map_destroy(p->info); 80 map_destroy(p->info);
81} 81}
82 82
83static int __devinit vr_nor_mtd_setup(struct vr_nor_mtd *p) 83static int vr_nor_mtd_setup(struct vr_nor_mtd *p)
84{ 84{
85 static const char *probe_types[] = 85 static const char *probe_types[] =
86 { "cfi_probe", "jedec_probe", NULL }; 86 { "cfi_probe", "jedec_probe", NULL };
@@ -116,7 +116,7 @@ static void __devexit vr_nor_destroy_maps(struct vr_nor_mtd *p)
116 * Initialize the map_info structure and map the flash. 116 * Initialize the map_info structure and map the flash.
117 * Returns 0 on success, nonzero otherwise. 117 * Returns 0 on success, nonzero otherwise.
118 */ 118 */
119static int __devinit vr_nor_init_maps(struct vr_nor_mtd *p) 119static int vr_nor_init_maps(struct vr_nor_mtd *p)
120{ 120{
121 unsigned long csr_phys, csr_len; 121 unsigned long csr_phys, csr_len;
122 unsigned long win_phys, win_len; 122 unsigned long win_phys, win_len;
@@ -189,7 +189,7 @@ static void __devexit vr_nor_pci_remove(struct pci_dev *dev)
189 pci_disable_device(dev); 189 pci_disable_device(dev);
190} 190}
191 191
192static int __devinit 192static int
193vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 193vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
194{ 194{
195 struct vr_nor_mtd *p = NULL; 195 struct vr_nor_mtd *p = NULL;
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index 4c032f168138..58d1f61a70b0 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -109,7 +109,7 @@ ltq_copy_to(struct map_info *map, unsigned long to,
109 spin_unlock_irqrestore(&ebu_lock, flags); 109 spin_unlock_irqrestore(&ebu_lock, flags);
110} 110}
111 111
112static int __devinit 112static int
113ltq_mtd_probe(struct platform_device *pdev) 113ltq_mtd_probe(struct platform_device *pdev)
114{ 114{
115 struct mtd_part_parser_data ppdata; 115 struct mtd_part_parser_data ppdata;
diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c
index 962a76a283a5..ab0fead56b83 100644
--- a/drivers/mtd/maps/latch-addr-flash.c
+++ b/drivers/mtd/maps/latch-addr-flash.c
@@ -125,7 +125,7 @@ static int latch_addr_flash_remove(struct platform_device *dev)
125 return 0; 125 return 0;
126} 126}
127 127
128static int __devinit latch_addr_flash_probe(struct platform_device *dev) 128static int latch_addr_flash_probe(struct platform_device *dev)
129{ 129{
130 struct latch_addr_flash_data *latch_addr_data; 130 struct latch_addr_flash_data *latch_addr_data;
131 struct latch_addr_flash_info *info; 131 struct latch_addr_flash_info *info;
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index ddc8c0c56d01..81a8caf3bd13 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -253,7 +253,7 @@ static struct pci_device_id mtd_pci_ids[] = {
253 * Generic code follows. 253 * Generic code follows.
254 */ 254 */
255 255
256static int __devinit 256static int
257mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 257mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
258{ 258{
259 struct mtd_pci_info *info = (struct mtd_pci_info *)id->driver_data; 259 struct mtd_pci_info *info = (struct mtd_pci_info *)id->driver_data;
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index d7f19bc6de4a..cde8bf94338e 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -77,7 +77,7 @@ static int of_flash_remove(struct platform_device *dev)
77/* Helper function to handle probing of the obsolete "direct-mapped" 77/* Helper function to handle probing of the obsolete "direct-mapped"
78 * compatible binding, which has an extra "probe-type" property 78 * compatible binding, which has an extra "probe-type" property
79 * describing the type of flash probe necessary. */ 79 * describing the type of flash probe necessary. */
80static struct mtd_info * __devinit obsolete_probe(struct platform_device *dev, 80static struct mtd_info *obsolete_probe(struct platform_device *dev,
81 struct map_info *map) 81 struct map_info *map)
82{ 82{
83 struct device_node *dp = dev->dev.of_node; 83 struct device_node *dp = dev->dev.of_node;
@@ -116,7 +116,7 @@ static struct mtd_info * __devinit obsolete_probe(struct platform_device *dev,
116 information. */ 116 information. */
117static const char *part_probe_types_def[] = { "cmdlinepart", "RedBoot", 117static const char *part_probe_types_def[] = { "cmdlinepart", "RedBoot",
118 "ofpart", "ofoldpart", NULL }; 118 "ofpart", "ofoldpart", NULL };
119static const char ** __devinit of_get_probes(struct device_node *dp) 119static const char **of_get_probes(struct device_node *dp)
120{ 120{
121 const char *cp; 121 const char *cp;
122 int cplen; 122 int cplen;
@@ -145,14 +145,14 @@ static const char ** __devinit of_get_probes(struct device_node *dp)
145 return res; 145 return res;
146} 146}
147 147
148static void __devinit of_free_probes(const char **probes) 148static void of_free_probes(const char **probes)
149{ 149{
150 if (probes != part_probe_types_def) 150 if (probes != part_probe_types_def)
151 kfree(probes); 151 kfree(probes);
152} 152}
153 153
154static struct of_device_id of_flash_match[]; 154static struct of_device_id of_flash_match[];
155static int __devinit of_flash_probe(struct platform_device *dev) 155static int of_flash_probe(struct platform_device *dev)
156{ 156{
157 const char **part_probe_types; 157 const char **part_probe_types;
158 const struct of_device_id *match; 158 const struct of_device_id *match;
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index 9f4e5947c99f..01db0d0b076a 100644
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -58,7 +58,7 @@ static void pismo_set_vpp(struct platform_device *pdev, int on)
58 pismo->vpp(pismo->vpp_data, on); 58 pismo->vpp(pismo->vpp_data, on);
59} 59}
60 60
61static unsigned int __devinit pismo_width_to_bytes(unsigned int width) 61static unsigned int pismo_width_to_bytes(unsigned int width)
62{ 62{
63 width &= 15; 63 width &= 15;
64 if (width > 2) 64 if (width > 2)
@@ -66,7 +66,7 @@ static unsigned int __devinit pismo_width_to_bytes(unsigned int width)
66 return 1 << width; 66 return 1 << width;
67} 67}
68 68
69static int __devinit pismo_eeprom_read(struct i2c_client *client, void *buf, 69static int pismo_eeprom_read(struct i2c_client *client, void *buf,
70 u8 addr, size_t size) 70 u8 addr, size_t size)
71{ 71{
72 int ret; 72 int ret;
@@ -88,7 +88,7 @@ static int __devinit pismo_eeprom_read(struct i2c_client *client, void *buf,
88 return ret == ARRAY_SIZE(msg) ? size : -EIO; 88 return ret == ARRAY_SIZE(msg) ? size : -EIO;
89} 89}
90 90
91static int __devinit pismo_add_device(struct pismo_data *pismo, int i, 91static int pismo_add_device(struct pismo_data *pismo, int i,
92 struct pismo_mem *region, const char *name, void *pdata, size_t psize) 92 struct pismo_mem *region, const char *name, void *pdata, size_t psize)
93{ 93{
94 struct platform_device *dev; 94 struct platform_device *dev;
@@ -129,7 +129,7 @@ static int __devinit pismo_add_device(struct pismo_data *pismo, int i,
129 return ret; 129 return ret;
130} 130}
131 131
132static int __devinit pismo_add_nor(struct pismo_data *pismo, int i, 132static int pismo_add_nor(struct pismo_data *pismo, int i,
133 struct pismo_mem *region) 133 struct pismo_mem *region)
134{ 134{
135 struct physmap_flash_data data = { 135 struct physmap_flash_data data = {
@@ -143,7 +143,7 @@ static int __devinit pismo_add_nor(struct pismo_data *pismo, int i,
143 &data, sizeof(data)); 143 &data, sizeof(data));
144} 144}
145 145
146static int __devinit pismo_add_sram(struct pismo_data *pismo, int i, 146static int pismo_add_sram(struct pismo_data *pismo, int i,
147 struct pismo_mem *region) 147 struct pismo_mem *region)
148{ 148{
149 struct platdata_mtd_ram data = { 149 struct platdata_mtd_ram data = {
@@ -154,7 +154,7 @@ static int __devinit pismo_add_sram(struct pismo_data *pismo, int i,
154 &data, sizeof(data)); 154 &data, sizeof(data));
155} 155}
156 156
157static void __devinit pismo_add_one(struct pismo_data *pismo, int i, 157static void pismo_add_one(struct pismo_data *pismo, int i,
158 const struct pismo_cs_block *cs, phys_addr_t base) 158 const struct pismo_cs_block *cs, phys_addr_t base)
159{ 159{
160 struct device *dev = &pismo->client->dev; 160 struct device *dev = &pismo->client->dev;
@@ -210,7 +210,7 @@ static int __devexit pismo_remove(struct i2c_client *client)
210 return 0; 210 return 0;
211} 211}
212 212
213static int __devinit pismo_probe(struct i2c_client *client, 213static int pismo_probe(struct i2c_client *client,
214 const struct i2c_device_id *id) 214 const struct i2c_device_id *id)
215{ 215{
216 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); 216 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index f913a1c3f2b9..b5120f9e9845 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -49,7 +49,7 @@ struct pxa2xx_flash_info {
49static const char *probes[] = { "RedBoot", "cmdlinepart", NULL }; 49static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
50 50
51 51
52static int __devinit pxa2xx_flash_probe(struct platform_device *pdev) 52static int pxa2xx_flash_probe(struct platform_device *pdev)
53{ 53{
54 struct flash_platform_data *flash = pdev->dev.platform_data; 54 struct flash_platform_data *flash = pdev->dev.platform_data;
55 struct pxa2xx_flash_info *info; 55 struct pxa2xx_flash_info *info;
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index a675bdbcb0fe..7aebc82a5c6d 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -149,8 +149,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
149 plat->exit(); 149 plat->exit();
150} 150}
151 151
152static struct sa_info *__devinit 152static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
153sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
154{ 153{
155 struct sa_info *info; 154 struct sa_info *info;
156 int nr, size, i, ret = 0; 155 int nr, size, i, ret = 0;
@@ -246,7 +245,7 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
246 245
247static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; 246static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
248 247
249static int __devinit sa1100_mtd_probe(struct platform_device *pdev) 248static int sa1100_mtd_probe(struct platform_device *pdev)
250{ 249{
251 struct flash_platform_data *plat = pdev->dev.platform_data; 250 struct flash_platform_data *plat = pdev->dev.platform_data;
252 struct sa_info *info; 251 struct sa_info *info;
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c
index d527608e5d22..bb1857f70bb1 100644
--- a/drivers/mtd/maps/scb2_flash.c
+++ b/drivers/mtd/maps/scb2_flash.c
@@ -69,7 +69,7 @@ static struct map_info scb2_map = {
69}; 69};
70static int region_fail; 70static int region_fail;
71 71
72static int __devinit 72static int
73scb2_fixup_mtd(struct mtd_info *mtd) 73scb2_fixup_mtd(struct mtd_info *mtd)
74{ 74{
75 int i; 75 int i;
@@ -133,7 +133,7 @@ scb2_fixup_mtd(struct mtd_info *mtd)
133/* CSB5's 'Function Control Register' has bits for decoding @ >= 0xffc00000 */ 133/* CSB5's 'Function Control Register' has bits for decoding @ >= 0xffc00000 */
134#define CSB5_FCR 0x41 134#define CSB5_FCR 0x41
135#define CSB5_FCR_DECODE_ALL 0x0e 135#define CSB5_FCR_DECODE_ALL 0x0e
136static int __devinit 136static int
137scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent) 137scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
138{ 138{
139 u8 reg; 139 u8 reg;
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 1c03ca7c4a74..2618e4dd2718 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -108,7 +108,7 @@ int uflash_devinit(struct platform_device *op, struct device_node *dp)
108 return 0; 108 return 0;
109} 109}
110 110
111static int __devinit uflash_probe(struct platform_device *op) 111static int uflash_probe(struct platform_device *op)
112{ 112{
113 struct device_node *dp = op->dev.of_node; 113 struct device_node *dp = op->dev.of_node;
114 114
diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 5a83a264eb83..84c3f5a99e12 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -596,7 +596,7 @@ fail_name:
596} 596}
597 597
598/* Handles very basic info about the flash, queries for details */ 598/* Handles very basic info about the flash, queries for details */
599static int __devinit vmu_connect(struct maple_device *mdev) 599static int vmu_connect(struct maple_device *mdev)
600{ 600{
601 unsigned long test_flash_data, basic_flash_data; 601 unsigned long test_flash_data, basic_flash_data;
602 int c, error; 602 int c, error;
@@ -772,7 +772,7 @@ static void vmu_file_error(struct maple_device *mdev, void *recvbuf)
772} 772}
773 773
774 774
775static int __devinit probe_maple_vmu(struct device *dev) 775static int probe_maple_vmu(struct device *dev)
776{ 776{
777 int error; 777 int error;
778 struct maple_device *mdev = to_maple_dev(dev); 778 struct maple_device *mdev = to_maple_dev(dev);
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 51dba43e2879..703e37387135 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -173,7 +173,7 @@ static const struct gpio _mandatory_gpio[] = {
173/* 173/*
174 * Main initialization routine 174 * Main initialization routine
175 */ 175 */
176static int __devinit ams_delta_init(struct platform_device *pdev) 176static int ams_delta_init(struct platform_device *pdev)
177{ 177{
178 struct nand_chip *this; 178 struct nand_chip *this;
179 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 179 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 914455783302..c9183866a163 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -330,13 +330,13 @@ static void atmel_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
330 * 12-bits 20-bytes 21-bytes 330 * 12-bits 20-bytes 21-bytes
331 * 24-bits 39-bytes 42-bytes 331 * 24-bits 39-bytes 42-bytes
332 */ 332 */
333static int __devinit pmecc_get_ecc_bytes(int cap, int sector_size) 333static int pmecc_get_ecc_bytes(int cap, int sector_size)
334{ 334{
335 int m = 12 + sector_size / 512; 335 int m = 12 + sector_size / 512;
336 return (m * cap + 7) / 8; 336 return (m * cap + 7) / 8;
337} 337}
338 338
339static void __devinit pmecc_config_ecc_layout(struct nand_ecclayout *layout, 339static void pmecc_config_ecc_layout(struct nand_ecclayout *layout,
340 int oobsize, int ecc_len) 340 int oobsize, int ecc_len)
341{ 341{
342 int i; 342 int i;
@@ -352,7 +352,7 @@ static void __devinit pmecc_config_ecc_layout(struct nand_ecclayout *layout,
352 oobsize - ecc_len - layout->oobfree[0].offset; 352 oobsize - ecc_len - layout->oobfree[0].offset;
353} 353}
354 354
355static void __devinit __iomem *pmecc_get_alpha_to(struct atmel_nand_host *host) 355static void __iomem *pmecc_get_alpha_to(struct atmel_nand_host *host)
356{ 356{
357 int table_size; 357 int table_size;
358 358
@@ -374,7 +374,7 @@ static void pmecc_data_free(struct atmel_nand_host *host)
374 kfree(host->pmecc_delta); 374 kfree(host->pmecc_delta);
375} 375}
376 376
377static int __devinit pmecc_data_alloc(struct atmel_nand_host *host) 377static int pmecc_data_alloc(struct atmel_nand_host *host)
378{ 378{
379 const int cap = host->pmecc_corr_cap; 379 const int cap = host->pmecc_corr_cap;
380 380
@@ -1205,7 +1205,7 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
1205} 1205}
1206 1206
1207#if defined(CONFIG_OF) 1207#if defined(CONFIG_OF)
1208static int __devinit atmel_of_init_port(struct atmel_nand_host *host, 1208static int atmel_of_init_port(struct atmel_nand_host *host,
1209 struct device_node *np) 1209 struct device_node *np)
1210{ 1210{
1211 u32 val, table_offset; 1211 u32 val, table_offset;
@@ -1292,7 +1292,7 @@ static int __devinit atmel_of_init_port(struct atmel_nand_host *host,
1292 return 0; 1292 return 0;
1293} 1293}
1294#else 1294#else
1295static int __devinit atmel_of_init_port(struct atmel_nand_host *host, 1295static int atmel_of_init_port(struct atmel_nand_host *host,
1296 struct device_node *np) 1296 struct device_node *np)
1297{ 1297{
1298 return -EINVAL; 1298 return -EINVAL;
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index d84af46ccc8d..73d6423680ca 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -382,7 +382,7 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i
382 while(!this->dev_ready(mtd)); 382 while(!this->dev_ready(mtd));
383} 383}
384 384
385static int __devinit find_nand_cs(unsigned long nand_base) 385static int find_nand_cs(unsigned long nand_base)
386{ 386{
387 void __iomem *base = 387 void __iomem *base =
388 (void __iomem *)KSEG1ADDR(AU1000_STATIC_MEM_PHYS_ADDR); 388 (void __iomem *)KSEG1ADDR(AU1000_STATIC_MEM_PHYS_ADDR);
@@ -403,7 +403,7 @@ static int __devinit find_nand_cs(unsigned long nand_base)
403 return -ENODEV; 403 return -ENODEV;
404} 404}
405 405
406static int __devinit au1550nd_probe(struct platform_device *pdev) 406static int au1550nd_probe(struct platform_device *pdev)
407{ 407{
408 struct au1550nd_platdata *pd; 408 struct au1550nd_platdata *pd;
409 struct au1550nd_ctx *ctx; 409 struct au1550nd_ctx *ctx;
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 0afd4ac34248..56de9b676385 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -658,7 +658,7 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info)
658/* 658/*
659 * Device management interface 659 * Device management interface
660 */ 660 */
661static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info) 661static int bf5xx_nand_add_partition(struct bf5xx_nand_info *info)
662{ 662{
663 struct mtd_info *mtd = &info->mtd; 663 struct mtd_info *mtd = &info->mtd;
664 struct mtd_partition *parts = info->platform->partitions; 664 struct mtd_partition *parts = info->platform->partitions;
@@ -725,7 +725,7 @@ static int bf5xx_nand_scan(struct mtd_info *mtd)
725 * it can allocate all necessary resources then calls the 725 * it can allocate all necessary resources then calls the
726 * nand layer to look for devices 726 * nand layer to look for devices
727 */ 727 */
728static int __devinit bf5xx_nand_probe(struct platform_device *pdev) 728static int bf5xx_nand_probe(struct platform_device *pdev)
729{ 729{
730 struct bf5xx_nand_platform *plat = to_nand_plat(pdev); 730 struct bf5xx_nand_platform *plat = to_nand_plat(pdev);
731 struct bf5xx_nand_info *info = NULL; 731 struct bf5xx_nand_info *info = NULL;
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 1b62f043bf7e..480834a98382 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -585,7 +585,7 @@ static int cafe_nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
585} 585}
586 586
587/* F_2[X]/(X**6+X+1) */ 587/* F_2[X]/(X**6+X+1) */
588static unsigned short __devinit gf64_mul(u8 a, u8 b) 588static unsigned short gf64_mul(u8 a, u8 b)
589{ 589{
590 u8 c; 590 u8 c;
591 unsigned int i; 591 unsigned int i;
@@ -604,7 +604,7 @@ static unsigned short __devinit gf64_mul(u8 a, u8 b)
604} 604}
605 605
606/* F_64[X]/(X**2+X+A**-1) with A the generator of F_64[X] */ 606/* F_64[X]/(X**2+X+A**-1) with A the generator of F_64[X] */
607static u16 __devinit gf4096_mul(u16 a, u16 b) 607static u16 gf4096_mul(u16 a, u16 b)
608{ 608{
609 u8 ah, al, bh, bl, ch, cl; 609 u8 ah, al, bh, bl, ch, cl;
610 610
@@ -619,14 +619,14 @@ static u16 __devinit gf4096_mul(u16 a, u16 b)
619 return (ch << 6) ^ cl; 619 return (ch << 6) ^ cl;
620} 620}
621 621
622static int __devinit cafe_mul(int x) 622static int cafe_mul(int x)
623{ 623{
624 if (x == 0) 624 if (x == 0)
625 return 1; 625 return 1;
626 return gf4096_mul(x, 0xe01); 626 return gf4096_mul(x, 0xe01);
627} 627}
628 628
629static int __devinit cafe_nand_probe(struct pci_dev *pdev, 629static int cafe_nand_probe(struct pci_dev *pdev,
630 const struct pci_device_id *ent) 630 const struct pci_device_id *ent)
631{ 631{
632 struct mtd_info *mtd; 632 struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c
index 445de7c8bb50..f9b593c81db6 100644
--- a/drivers/mtd/nand/denali_dt.c
+++ b/drivers/mtd/nand/denali_dt.c
@@ -57,7 +57,7 @@ MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);
57 57
58static u64 denali_dma_mask; 58static u64 denali_dma_mask;
59 59
60static int __devinit denali_dt_probe(struct platform_device *ofdev) 60static int denali_dt_probe(struct platform_device *ofdev)
61{ 61{
62 struct resource *denali_reg, *nand_data; 62 struct resource *denali_reg, *nand_data;
63 struct denali_dt *dt; 63 struct denali_dt *dt;
diff --git a/drivers/mtd/nand/denali_pci.c b/drivers/mtd/nand/denali_pci.c
index ea074e6c7622..f1f8f896fcc8 100644
--- a/drivers/mtd/nand/denali_pci.c
+++ b/drivers/mtd/nand/denali_pci.c
@@ -130,7 +130,7 @@ static struct pci_driver denali_pci_driver = {
130 .remove = denali_pci_remove, 130 .remove = denali_pci_remove,
131}; 131};
132 132
133static int __devinit denali_init_pci(void) 133static int denali_init_pci(void)
134{ 134{
135 pr_info("Spectra MTD driver built on %s @ %s\n", __DATE__, __TIME__); 135 pr_info("Spectra MTD driver built on %s @ %s\n", __DATE__, __TIME__);
136 return pci_register_driver(&denali_pci_driver); 136 return pci_register_driver(&denali_pci_driver);
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 4c4d3e5bca18..20657209a472 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -799,7 +799,7 @@ static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv)
799 799
800static DEFINE_MUTEX(fsl_elbc_nand_mutex); 800static DEFINE_MUTEX(fsl_elbc_nand_mutex);
801 801
802static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev) 802static int fsl_elbc_nand_probe(struct platform_device *pdev)
803{ 803{
804 struct fsl_lbc_regs __iomem *lbc; 804 struct fsl_lbc_regs __iomem *lbc;
805 struct fsl_elbc_mtd *priv; 805 struct fsl_elbc_mtd *priv;
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 53152310804c..ad6222627fed 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -922,7 +922,7 @@ static int match_bank(struct fsl_ifc_regs __iomem *ifc, int bank,
922 922
923static DEFINE_MUTEX(fsl_ifc_nand_mutex); 923static DEFINE_MUTEX(fsl_ifc_nand_mutex);
924 924
925static int __devinit fsl_ifc_nand_probe(struct platform_device *dev) 925static int fsl_ifc_nand_probe(struct platform_device *dev)
926{ 926{
927 struct fsl_ifc_regs __iomem *ifc; 927 struct fsl_ifc_regs __iomem *ifc;
928 struct fsl_ifc_mtd *priv; 928 struct fsl_ifc_mtd *priv;
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index b40661d7160e..a5643252584b 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -152,7 +152,7 @@ static void fun_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
152 fun_wait_rnb(fun); 152 fun_wait_rnb(fun);
153} 153}
154 154
155static int __devinit fun_chip_init(struct fsl_upm_nand *fun, 155static int fun_chip_init(struct fsl_upm_nand *fun,
156 const struct device_node *upm_np, 156 const struct device_node *upm_np,
157 const struct resource *io_res) 157 const struct resource *io_res)
158{ 158{
@@ -201,7 +201,7 @@ err:
201 return ret; 201 return ret;
202} 202}
203 203
204static int __devinit fun_probe(struct platform_device *ofdev) 204static int fun_probe(struct platform_device *ofdev)
205{ 205{
206 struct fsl_upm_nand *fun; 206 struct fsl_upm_nand *fun;
207 struct resource io_res; 207 struct resource io_res;
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 6b592235f847..1d7446434b0e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -864,7 +864,7 @@ static bool filter(struct dma_chan *chan, void *slave)
864} 864}
865 865
866#ifdef CONFIG_OF 866#ifdef CONFIG_OF
867static int __devinit fsmc_nand_probe_config_dt(struct platform_device *pdev, 867static int fsmc_nand_probe_config_dt(struct platform_device *pdev,
868 struct device_node *np) 868 struct device_node *np)
869{ 869{
870 struct fsmc_nand_platform_data *pdata = dev_get_platdata(&pdev->dev); 870 struct fsmc_nand_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -886,7 +886,7 @@ static int __devinit fsmc_nand_probe_config_dt(struct platform_device *pdev,
886 return 0; 886 return 0;
887} 887}
888#else 888#else
889static int __devinit fsmc_nand_probe_config_dt(struct platform_device *pdev, 889static int fsmc_nand_probe_config_dt(struct platform_device *pdev,
890 struct device_node *np) 890 struct device_node *np)
891{ 891{
892 return -ENOSYS; 892 return -ENOSYS;
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 0b3c815ef80c..45f1a240bcbd 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -282,7 +282,7 @@ static void __iomem *request_and_remap(struct resource *res, size_t size,
282 return ptr; 282 return ptr;
283} 283}
284 284
285static int __devinit gpio_nand_probe(struct platform_device *dev) 285static int gpio_nand_probe(struct platform_device *dev)
286{ 286{
287 struct gpiomtd *gpiomtd; 287 struct gpiomtd *gpiomtd;
288 struct nand_chip *this; 288 struct nand_chip *this;
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 7ce6d01a3c94..2a251c95a703 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -319,7 +319,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
319 return 0; 319 return 0;
320} 320}
321 321
322static int __devinit 322static int
323acquire_register_block(struct gpmi_nand_data *this, const char *res_name) 323acquire_register_block(struct gpmi_nand_data *this, const char *res_name)
324{ 324{
325 struct platform_device *pdev = this->pdev; 325 struct platform_device *pdev = this->pdev;
@@ -360,7 +360,7 @@ static void release_register_block(struct gpmi_nand_data *this)
360 res->bch_regs = NULL; 360 res->bch_regs = NULL;
361} 361}
362 362
363static int __devinit 363static int
364acquire_bch_irq(struct gpmi_nand_data *this, irq_handler_t irq_h) 364acquire_bch_irq(struct gpmi_nand_data *this, irq_handler_t irq_h)
365{ 365{
366 struct platform_device *pdev = this->pdev; 366 struct platform_device *pdev = this->pdev;
@@ -427,7 +427,7 @@ static void release_dma_channels(struct gpmi_nand_data *this)
427 } 427 }
428} 428}
429 429
430static int __devinit acquire_dma_channels(struct gpmi_nand_data *this) 430static int acquire_dma_channels(struct gpmi_nand_data *this)
431{ 431{
432 struct platform_device *pdev = this->pdev; 432 struct platform_device *pdev = this->pdev;
433 struct resource *r_dma; 433 struct resource *r_dma;
@@ -492,7 +492,7 @@ static char *extra_clks_for_mx6q[GPMI_CLK_MAX] = {
492 "gpmi_apb", "gpmi_bch", "gpmi_bch_apb", "per1_bch", 492 "gpmi_apb", "gpmi_bch", "gpmi_bch_apb", "per1_bch",
493}; 493};
494 494
495static int __devinit gpmi_get_clks(struct gpmi_nand_data *this) 495static int gpmi_get_clks(struct gpmi_nand_data *this)
496{ 496{
497 struct resources *r = &this->resources; 497 struct resources *r = &this->resources;
498 char **extra_clks = NULL; 498 char **extra_clks = NULL;
@@ -538,7 +538,7 @@ err_clock:
538 return -ENOMEM; 538 return -ENOMEM;
539} 539}
540 540
541static int __devinit acquire_resources(struct gpmi_nand_data *this) 541static int acquire_resources(struct gpmi_nand_data *this)
542{ 542{
543 struct pinctrl *pinctrl; 543 struct pinctrl *pinctrl;
544 int ret; 544 int ret;
@@ -588,7 +588,7 @@ static void release_resources(struct gpmi_nand_data *this)
588 release_dma_channels(this); 588 release_dma_channels(this);
589} 589}
590 590
591static int __devinit init_hardware(struct gpmi_nand_data *this) 591static int init_hardware(struct gpmi_nand_data *this)
592{ 592{
593 int ret; 593 int ret;
594 594
@@ -1542,7 +1542,7 @@ static void gpmi_nfc_exit(struct gpmi_nand_data *this)
1542 gpmi_free_dma_buffer(this); 1542 gpmi_free_dma_buffer(this);
1543} 1543}
1544 1544
1545static int __devinit gpmi_nfc_init(struct gpmi_nand_data *this) 1545static int gpmi_nfc_init(struct gpmi_nand_data *this)
1546{ 1546{
1547 struct mtd_info *mtd = &this->mtd; 1547 struct mtd_info *mtd = &this->mtd;
1548 struct nand_chip *chip = &this->nand; 1548 struct nand_chip *chip = &this->nand;
@@ -1625,7 +1625,7 @@ static const struct of_device_id gpmi_nand_id_table[] = {
1625}; 1625};
1626MODULE_DEVICE_TABLE(of, gpmi_nand_id_table); 1626MODULE_DEVICE_TABLE(of, gpmi_nand_id_table);
1627 1627
1628static int __devinit gpmi_nand_probe(struct platform_device *pdev) 1628static int gpmi_nand_probe(struct platform_device *pdev)
1629{ 1629{
1630 struct gpmi_nand_data *this; 1630 struct gpmi_nand_data *this;
1631 const struct of_device_id *of_id; 1631 const struct of_device_id *of_id;
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 2552fe28d050..5396b6ceb088 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -322,7 +322,7 @@ static inline void jz_nand_iounmap_resource(struct resource *res, void __iomem *
322 release_mem_region(res->start, resource_size(res)); 322 release_mem_region(res->start, resource_size(res));
323} 323}
324 324
325static int __devinit jz_nand_detect_bank(struct platform_device *pdev, struct jz_nand *nand, unsigned char bank, size_t chipnr, uint8_t *nand_maf_id, uint8_t *nand_dev_id) { 325static int jz_nand_detect_bank(struct platform_device *pdev, struct jz_nand *nand, unsigned char bank, size_t chipnr, uint8_t *nand_maf_id, uint8_t *nand_dev_id) {
326 int ret; 326 int ret;
327 int gpio; 327 int gpio;
328 char gpio_name[9]; 328 char gpio_name[9];
@@ -400,7 +400,7 @@ notfound_gpio:
400 return ret; 400 return ret;
401} 401}
402 402
403static int __devinit jz_nand_probe(struct platform_device *pdev) 403static int jz_nand_probe(struct platform_device *pdev)
404{ 404{
405 int ret; 405 int ret;
406 struct jz_nand *nand; 406 struct jz_nand *nand;
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 311564259d28..bb83daf9c739 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -655,7 +655,7 @@ static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev)
655/* 655/*
656 * Probe for NAND controller 656 * Probe for NAND controller
657 */ 657 */
658static int __devinit lpc32xx_nand_probe(struct platform_device *pdev) 658static int lpc32xx_nand_probe(struct platform_device *pdev)
659{ 659{
660 struct lpc32xx_nand_host *host; 660 struct lpc32xx_nand_host *host;
661 struct mtd_info *mtd; 661 struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 9e291b71a8cc..17267f2819d2 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -755,7 +755,7 @@ static struct lpc32xx_nand_cfg_slc *lpc32xx_parse_dt(struct device *dev)
755/* 755/*
756 * Probe for NAND controller 756 * Probe for NAND controller
757 */ 757 */
758static int __devinit lpc32xx_nand_probe(struct platform_device *pdev) 758static int lpc32xx_nand_probe(struct platform_device *pdev)
759{ 759{
760 struct lpc32xx_nand_host *host; 760 struct lpc32xx_nand_host *host;
761 struct mtd_info *mtd; 761 struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 17fe0c942fb0..f779e6a3d4b2 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -626,7 +626,7 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd)
626 iounmap(prv->csreg); 626 iounmap(prv->csreg);
627} 627}
628 628
629static int __devinit mpc5121_nfc_probe(struct platform_device *op) 629static int mpc5121_nfc_probe(struct platform_device *op)
630{ 630{
631 struct device_node *rootnode, *dn = op->dev.of_node; 631 struct device_node *rootnode, *dn = op->dev.of_node;
632 struct device *dev = &op->dev; 632 struct device *dev = &op->dev;
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index a4caf640a307..77a03cf64dd3 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1363,7 +1363,7 @@ static int __init mxcnd_probe_pdata(struct mxc_nand_host *host)
1363 return 0; 1363 return 0;
1364} 1364}
1365 1365
1366static int __devinit mxcnd_probe(struct platform_device *pdev) 1366static int mxcnd_probe(struct platform_device *pdev)
1367{ 1367{
1368 struct nand_chip *this; 1368 struct nand_chip *this;
1369 struct mtd_info *mtd; 1369 struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 32e6bef480dc..6fa4588d4771 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -197,7 +197,7 @@ err:
197 return ret; 197 return ret;
198} 198}
199 199
200static int __devinit ndfc_probe(struct platform_device *ofdev) 200static int ndfc_probe(struct platform_device *ofdev)
201{ 201{
202 struct ndfc_controller *ndfc; 202 struct ndfc_controller *ndfc;
203 const __be32 *reg; 203 const __be32 *reg;
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index eed134c55326..00766dfe4d3f 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -246,7 +246,7 @@ static void nuc900_nand_enable(struct nuc900_nand *nand)
246 spin_unlock(&nand->lock); 246 spin_unlock(&nand->lock);
247} 247}
248 248
249static int __devinit nuc900_nand_probe(struct platform_device *pdev) 249static int nuc900_nand_probe(struct platform_device *pdev)
250{ 250{
251 struct nuc900_nand *nuc900_nand; 251 struct nuc900_nand *nuc900_nand;
252 struct nand_chip *chip; 252 struct nand_chip *chip;
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 5b3138620646..b00ccb2a68c7 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1239,7 +1239,7 @@ static void omap3_free_bch(struct mtd_info *mtd)
1239} 1239}
1240#endif /* CONFIG_MTD_NAND_OMAP_BCH */ 1240#endif /* CONFIG_MTD_NAND_OMAP_BCH */
1241 1241
1242static int __devinit omap_nand_probe(struct platform_device *pdev) 1242static int omap_nand_probe(struct platform_device *pdev)
1243{ 1243{
1244 struct omap_nand_info *info; 1244 struct omap_nand_info *info;
1245 struct omap_nand_platform_data *pdata; 1245 struct omap_nand_platform_data *pdata;
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 1440e51cedcc..2e477cb20b73 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -89,7 +89,7 @@ int pasemi_device_ready(struct mtd_info *mtd)
89 return !!(inl(lpcctl) & LBICTRL_LPCCTL_NR); 89 return !!(inl(lpcctl) & LBICTRL_LPCCTL_NR);
90} 90}
91 91
92static int __devinit pasemi_nand_probe(struct platform_device *ofdev) 92static int pasemi_nand_probe(struct platform_device *ofdev)
93{ 93{
94 struct pci_dev *pdev; 94 struct pci_dev *pdev;
95 struct device_node *np = ofdev->dev.of_node; 95 struct device_node *np = ofdev->dev.of_node;
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 95a1dba150d2..32e2996c9e73 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -28,7 +28,7 @@ static const char *part_probe_types[] = { "cmdlinepart", NULL };
28/* 28/*
29 * Probe for the NAND device. 29 * Probe for the NAND device.
30 */ 30 */
31static int __devinit plat_nand_probe(struct platform_device *pdev) 31static int plat_nand_probe(struct platform_device *pdev)
32{ 32{
33 struct platform_nand_data *pdata = pdev->dev.platform_data; 33 struct platform_nand_data *pdata = pdev->dev.platform_data;
34 struct mtd_part_parser_data ppdata; 34 struct mtd_part_parser_data ppdata;
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index d51e3c15d379..e45d6bd2901a 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -1086,7 +1086,7 @@ static struct sh_flctl_platform_data *flctl_parse_dt(struct device *dev)
1086} 1086}
1087#endif /* CONFIG_OF */ 1087#endif /* CONFIG_OF */
1088 1088
1089static int __devinit flctl_probe(struct platform_device *pdev) 1089static int flctl_probe(struct platform_device *pdev)
1090{ 1090{
1091 struct resource *res; 1091 struct resource *res;
1092 struct sh_flctl *flctl; 1092 struct sh_flctl *flctl;
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 541fd5117625..870f0ff76c5f 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -106,7 +106,7 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat,
106/* 106/*
107 * Main initialization routine 107 * Main initialization routine
108 */ 108 */
109static int __devinit sharpsl_nand_probe(struct platform_device *pdev) 109static int sharpsl_nand_probe(struct platform_device *pdev)
110{ 110{
111 struct nand_chip *this; 111 struct nand_chip *this;
112 struct resource *r; 112 struct resource *r;
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 78b1a040b88a..c9791fd1ee53 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -140,7 +140,7 @@ static int socrates_nand_device_ready(struct mtd_info *mtd)
140/* 140/*
141 * Probe for the NAND device. 141 * Probe for the NAND device.
142 */ 142 */
143static int __devinit socrates_nand_probe(struct platform_device *ofdev) 143static int socrates_nand_probe(struct platform_device *ofdev)
144{ 144{
145 struct socrates_nand_host *host; 145 struct socrates_nand_host *host;
146 struct mtd_info *mtd; 146 struct mtd_info *mtd;
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index 27aa44a6ec26..03e6af342423 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -35,7 +35,7 @@ struct onenand_info {
35 struct onenand_chip onenand; 35 struct onenand_chip onenand;
36}; 36};
37 37
38static int __devinit generic_onenand_probe(struct platform_device *pdev) 38static int generic_onenand_probe(struct platform_device *pdev)
39{ 39{
40 struct onenand_info *info; 40 struct onenand_info *info;
41 struct onenand_platform_data *pdata = pdev->dev.platform_data; 41 struct onenand_platform_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 73dac4c64a90..8c10a2f54158 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -619,7 +619,7 @@ static int omap2_onenand_disable(struct mtd_info *mtd)
619 return ret; 619 return ret;
620} 620}
621 621
622static int __devinit omap2_onenand_probe(struct platform_device *pdev) 622static int omap2_onenand_probe(struct platform_device *pdev)
623{ 623{
624 struct omap_onenand_platform_data *pdata; 624 struct omap_onenand_platform_data *pdata;
625 struct omap2_onenand *c; 625 struct omap2_onenand *c;