CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton wf...@virginia.edu
Cc: David Woodhouse dw...@infradead.org
Cc: Wan ZongShun mcuos@gmail.com
Cc: Olof Johansson o...@lixom.net
Cc: Kyungmin Park kyungmin.p...@samsung.com
Cc: linux-...@lists.infradead.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
---
drivers/mtd/devices/m25p80.c | 4 ++--
drivers/mtd/devices/mtd_dataflash.c| 8
drivers/mtd/devices/spear_smi.c| 6 +++---
drivers/mtd/devices/sst25l.c | 4 ++--
drivers/mtd/maps/amd76xrom.c | 2 +-
drivers/mtd/maps/autcpu12-nvram.c | 2 +-
drivers/mtd/maps/bfin-async-flash.c| 2 +-
drivers/mtd/maps/ck804xrom.c | 2 +-
drivers/mtd/maps/esb2rom.c | 2 +-
drivers/mtd/maps/gpio-addr-flash.c | 2 +-
drivers/mtd/maps/ichxrom.c | 2 +-
drivers/mtd/maps/intel_vr_nor.c| 8
drivers/mtd/maps/lantiq-flash.c| 2 +-
drivers/mtd/maps/latch-addr-flash.c| 2 +-
drivers/mtd/maps/pci.c | 2 +-
drivers/mtd/maps/physmap_of.c | 8
drivers/mtd/maps/pismo.c | 14 +++---
drivers/mtd/maps/pxa2xx-flash.c| 2 +-
drivers/mtd/maps/sa1100-flash.c| 5 ++---
drivers/mtd/maps/scb2_flash.c | 4 ++--
drivers/mtd/maps/sun_uflash.c | 2 +-
drivers/mtd/maps/vmu-flash.c | 4 ++--
drivers/mtd/nand/ams-delta.c | 2 +-
drivers/mtd/nand/atmel_nand.c | 12 ++--
drivers/mtd/nand/au1550nd.c| 4 ++--
drivers/mtd/nand/bf5xx_nand.c | 4 ++--
drivers/mtd/nand/cafe_nand.c | 8
drivers/mtd/nand/denali_dt.c | 2 +-
drivers/mtd/nand/denali_pci.c | 2 +-
drivers/mtd/nand/fsl_elbc_nand.c | 2 +-
drivers/mtd/nand/fsl_ifc_nand.c| 2 +-
drivers/mtd/nand/fsl_upm.c | 4 ++--
drivers/mtd/nand/fsmc_nand.c | 4 ++--
drivers/mtd/nand/gpio.c| 2 +-
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 16
drivers/mtd/nand/jz4740_nand.c | 4 ++--
drivers/mtd/nand/lpc32xx_mlc.c | 2 +-
drivers/mtd/nand/lpc32xx_slc.c | 2 +-
drivers/mtd/nand/mpc5121_nfc.c | 2 +-
drivers/mtd/nand/mxc_nand.c| 2 +-
drivers/mtd/nand/ndfc.c| 2 +-
drivers/mtd/nand/nuc900_nand.c | 2 +-
drivers/mtd/nand/omap2.c | 2 +-
drivers/mtd/nand/pasemi_nand.c | 2 +-
drivers/mtd/nand/plat_nand.c | 2 +-
drivers/mtd/nand/sh_flctl.c| 2 +-
drivers/mtd/nand/sharpsl.c | 2 +-
drivers/mtd/nand/socrates_nand.c | 2 +-
drivers/mtd/onenand/generic.c | 2 +-
drivers/mtd/onenand/omap2.c| 2 +-
50 files changed, 92 insertions(+), 93 deletions(-)
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 9ffd3c5..700f991 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -754,7 +754,7 @@ static const struct spi_device_id m25p_ids[] = {
};
MODULE_DEVICE_TABLE(spi, m25p_ids);
-static const struct spi_device_id *__devinit jedec_probe(struct spi_device
*spi)
+static const struct spi_device_id *jedec_probe(struct spi_device *spi)
{
int tmp;
u8 code = OPCODE_RDID;
@@ -799,7 +799,7 @@ static const struct spi_device_id *__devinit
jedec_probe(struct spi_device *spi)
* matches what the READ command supports, at least until this driver
* understands FAST_READ (for clocks over 25 MHz).
*/
-static int __devinit m25p_probe(struct spi_device *spi)
+static int m25p_probe(struct spi_device *spi)
{
const struct spi_device_id *id = spi_get_device_id(spi);
struct flash_platform_data *data;
diff --git a/drivers/mtd/devices/mtd_dataflash.c
b/drivers/mtd/devices/mtd_dataflash.c
index 23ccc36..080cb1c 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)
/*
* Register DataFlash device with MTD subsystem.
*/
-static int __devinit
+static int
add_dataflash_otp(struct spi_device *spi, char *name,
int nr_pages, int pagesize, int pageoffset, char revision)
{
@@ -679,7 +679,7 @@ add_dataflash_otp(struct spi_device *spi, char *name,
return err;
}
-static inline int __devinit
+static inline int
add_dataflash(struct spi_device *spi, char *name,
int nr_pages, int pagesize, int pageoffset)
{
@@ -740,7 +740,7 @@ static struct flash_info __devinitdata dataflash_data [] = {
{ at45db642d, 0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS},
};
-static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
+static struct flash_info *jedec_probe(struct spi_device *spi)
{
