Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f25510 authored by Bill Pemberton's avatar Bill Pemberton Committed by Artem Bityutskiy
Browse files

mtd: remove use of __devinit 



CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 5153b88c

drivers/mtd/devices/m25p80.c

+2 −2
Original line number Diff line number Diff line
@@ -755,7 +755,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;
@@ -800,7 +800,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;

drivers/mtd/devices/mtd_dataflash.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

{

	int			tmp;

	uint8_t			code = OP_READ_ID;
@@ -823,7 +823,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) 
 *   AT45DB0642  64Mbit  (8M)    xx111xxx (0x3c)   8192   1056     11

 *   AT45DB1282  128Mbit (16M)   xx0100xx (0x10)  16384   1056     11

 */

static int __devinit dataflash_probe(struct spi_device *spi)

static int dataflash_probe(struct spi_device *spi)

{

	int status;

	struct flash_info	*info;

drivers/mtd/devices/spear_smi.c

+3 −3
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ static int spear_smi_probe_flash(struct spear_smi *dev, u32 bank) 




#ifdef CONFIG_OF

static int __devinit spear_smi_probe_config_dt(struct platform_device *pdev,

static int spear_smi_probe_config_dt(struct platform_device *pdev,

					       struct device_node *np)

{

	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, 
	return 0;

}

#else

static int __devinit spear_smi_probe_config_dt(struct platform_device *pdev,

static int spear_smi_probe_config_dt(struct platform_device *pdev,

					       struct device_node *np)

{

	return -ENOSYS;
@@ -901,7 +901,7 @@ static int spear_smi_setup_banks(struct platform_device *pdev, 
 * and do proper init for any found one.

 * Returns 0 on success, non zero otherwise

 */

static int __devinit spear_smi_probe(struct platform_device *pdev)

static int spear_smi_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct spear_smi_plat_data *pdata = NULL;

drivers/mtd/devices/sst25l.c

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static int sst25l_write(struct mtd_info *mtd, loff_t to, size_t len, 
	return ret;

}



static struct flash_info *__devinit sst25l_match_device(struct spi_device *spi)

static struct flash_info *sst25l_match_device(struct spi_device *spi)

{

	struct flash_info *flash_info = NULL;

	struct spi_message m;
@@ -353,7 +353,7 @@ static struct flash_info *__devinit sst25l_match_device(struct spi_device *spi) 
	return flash_info;

}



static int __devinit sst25l_probe(struct spi_device *spi)

static int sst25l_probe(struct spi_device *spi)

{

	struct flash_info *flash_info;

	struct sst25l_flash *flash;

drivers/mtd/maps/amd76xrom.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window) 
}





static int __devinit amd76xrom_init_one (struct pci_dev *pdev,

static int amd76xrom_init_one (struct pci_dev *pdev,

	const struct pci_device_id *ent)

{

	static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };