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

Commit d8929942 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: mtd: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b859f159

drivers/mtd/devices/mtd_dataflash.c

+4 −6
Original line number Diff line number Diff line
@@ -618,9 +618,8 @@ static char *otp_setup(struct mtd_info *device, char revision) 
/*

 * Register DataFlash device with MTD subsystem.

 */

static int

add_dataflash_otp(struct spi_device *spi, char *name,

		int nr_pages, int pagesize, int pageoffset, char revision)

static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,

			     int pagesize, int pageoffset, char revision)

{

	struct dataflash		*priv;

	struct mtd_info			*device;
@@ -679,8 +678,7 @@ add_dataflash_otp(struct spi_device *spi, char *name, 
	return err;

}



static inline int

add_dataflash(struct spi_device *spi, char *name,

static inline int add_dataflash(struct spi_device *spi, char *name,

				int nr_pages, int pagesize, int pageoffset)

{

	return add_dataflash_otp(spi, name, nr_pages, pagesize,

drivers/mtd/maps/intel_vr_nor.c

+1 −2
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ static void vr_nor_pci_remove(struct pci_dev *dev) 
	pci_disable_device(dev);

}



static int

vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	struct vr_nor_mtd *p = NULL;

	unsigned int exp_timing_cs0;

drivers/mtd/maps/pci.c

+2 −4
Original line number Diff line number Diff line
@@ -253,8 +253,7 @@ static struct pci_device_id mtd_pci_ids[] = { 
 * Generic code follows.

 */



static int

mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	struct mtd_pci_info *info = (struct mtd_pci_info *)id->driver_data;

	struct map_pci_info *map = NULL;
@@ -308,8 +307,7 @@ mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	return err;

}



static void

mtd_pci_remove(struct pci_dev *dev)

static void mtd_pci_remove(struct pci_dev *dev)

{

	struct mtd_info *mtd = pci_get_drvdata(dev);

	struct map_pci_info *map = mtd->priv;

drivers/mtd/maps/pismo.c

+8 −7
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ static unsigned int pismo_width_to_bytes(unsigned int width) 
	return 1 << width;

}



static int pismo_eeprom_read(struct i2c_client *client, void *buf,

	u8 addr, size_t size)

static int pismo_eeprom_read(struct i2c_client *client, void *buf, u8 addr,

			     size_t size)

{

	int ret;

	struct i2c_msg msg[] = {
@@ -89,7 +89,8 @@ static int pismo_eeprom_read(struct i2c_client *client, void *buf, 
}



static int pismo_add_device(struct pismo_data *pismo, int i,

	struct pismo_mem *region, const char *name, void *pdata, size_t psize)

			    struct pismo_mem *region, const char *name,

			    void *pdata, size_t psize)

{

	struct platform_device *dev;

	struct resource res = { };

drivers/mtd/maps/scb2_flash.c

+4 −6
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ static struct map_info scb2_map = { 
};

static int region_fail;



static int

scb2_fixup_mtd(struct mtd_info *mtd)

static int scb2_fixup_mtd(struct mtd_info *mtd)

{

	int i;

	int done = 0;
@@ -133,8 +132,8 @@ scb2_fixup_mtd(struct mtd_info *mtd) 
/* CSB5's 'Function Control Register' has bits for decoding @ >= 0xffc00000 */

#define CSB5_FCR	0x41

#define CSB5_FCR_DECODE_ALL 0x0e

static int

scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)

static int scb2_flash_probe(struct pci_dev *dev,

			    const struct pci_device_id *ent)

{

	u8 reg;
@@ -197,8 +196,7 @@ scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent) 
	return 0;

}



static void

scb2_flash_remove(struct pci_dev *dev)

static void scb2_flash_remove(struct pci_dev *dev)

{

	if (!scb2_mtd)

		return;