Darkangeel_hd
/
lineage_android_kernel_xiaomi_sdm845
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_xiaomi_sdm845.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:19:05 -08:00
parent b859f15921
commit d892994280
14 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/devices/mtd_dataflash.c
View File

@ -618,9 +618,8 @@ static char *otp_setup(struct mtd_info *device, char revision)
/* /*
* Register DataFlash device with MTD subsystem. * Register DataFlash device with MTD subsystem.
*/ */
static int static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
add_dataflash_otp(struct spi_device *spi, char *name, int pagesize, int pageoffset, char revision)
int nr_pages, int pagesize, int pageoffset, char revision)
{ {
struct dataflash *priv; struct dataflash *priv;
struct mtd_info *device; struct mtd_info *device;
@ -679,8 +678,7 @@ add_dataflash_otp(struct spi_device *spi, char *name,
return err; return err;
} }
static inline int static inline int add_dataflash(struct spi_device *spi, char *name,
add_dataflash(struct spi_device *spi, char *name,
int nr_pages, int pagesize, int pageoffset) int nr_pages, int pagesize, int pageoffset)
{ {
return add_dataflash_otp(spi, name, nr_pages, pagesize, return add_dataflash_otp(spi, name, nr_pages, pagesize,

3
drivers/mtd/maps/intel_vr_nor.c
View File

@ -189,8 +189,7 @@ static void vr_nor_pci_remove(struct pci_dev *dev)
pci_disable_device(dev); pci_disable_device(dev);
} }
static int static int vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct vr_nor_mtd *p = NULL; struct vr_nor_mtd *p = NULL;
unsigned int exp_timing_cs0; unsigned int exp_timing_cs0;

6
drivers/mtd/maps/pci.c
View File

@ -253,8 +253,7 @@ static struct pci_device_id mtd_pci_ids[] = {
* Generic code follows. * Generic code follows.
*/ */
static int static int mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
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 mtd_pci_info *info = (struct mtd_pci_info *)id->driver_data;
struct map_pci_info *map = NULL; struct map_pci_info *map = NULL;
@ -308,8 +307,7 @@ out:
return err; return err;
} }
static void static void mtd_pci_remove(struct pci_dev *dev)
mtd_pci_remove(struct pci_dev *dev)
{ {
struct mtd_info *mtd = pci_get_drvdata(dev); struct mtd_info *mtd = pci_get_drvdata(dev);
struct map_pci_info *map = mtd->priv; struct map_pci_info *map = mtd->priv;

7
drivers/mtd/maps/pismo.c
View File

@ -66,8 +66,8 @@ static unsigned int pismo_width_to_bytes(unsigned int width)
return 1 << width; return 1 << width;
} }
static int pismo_eeprom_read(struct i2c_client *client, void *buf, static int pismo_eeprom_read(struct i2c_client *client, void *buf, u8 addr,
u8 addr, size_t size) size_t size)
{ {
int ret; int ret;
struct i2c_msg msg[] = { 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, 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 platform_device *dev;
struct resource res = { }; struct resource res = { };

10
drivers/mtd/maps/scb2_flash.c
View File

@ -69,8 +69,7 @@ static struct map_info scb2_map = {
}; };
static int region_fail; static int region_fail;
static int static int scb2_fixup_mtd(struct mtd_info *mtd)
scb2_fixup_mtd(struct mtd_info *mtd)
{ {
int i; int i;
int done = 0; int done = 0;
@ -133,8 +132,8 @@ scb2_fixup_mtd(struct mtd_info *mtd)
/* CSB5's 'Function Control Register' has bits for decoding @ >= 0xffc00000 */ /* CSB5's 'Function Control Register' has bits for decoding @ >= 0xffc00000 */
#define CSB5_FCR 0x41 #define CSB5_FCR 0x41
#define CSB5_FCR_DECODE_ALL 0x0e #define CSB5_FCR_DECODE_ALL 0x0e
static int static int scb2_flash_probe(struct pci_dev *dev,
scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
u8 reg; u8 reg;
@ -197,8 +196,7 @@ scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
return 0; return 0;
} }
static void static void scb2_flash_remove(struct pci_dev *dev)
scb2_flash_remove(struct pci_dev *dev)
{ {
if (!scb2_mtd) if (!scb2_mtd)
return; return;

4
drivers/mtd/nand/bcm47xxnflash/main.c
View File

@ -66,7 +66,7 @@ out:
return err; return err;
} }
static int __devexit bcm47xxnflash_remove(struct platform_device *pdev) static int bcm47xxnflash_remove(struct platform_device *pdev)
{ {
struct bcma_nflash *nflash = dev_get_platdata(&pdev->dev); struct bcma_nflash *nflash = dev_get_platdata(&pdev->dev);
@ -77,7 +77,7 @@ static int __devexit bcm47xxnflash_remove(struct platform_device *pdev)
} }
static struct platform_driver bcm47xxnflash_driver = { static struct platform_driver bcm47xxnflash_driver = {
.remove = __devexit_p(bcm47xxnflash_remove), .remove = bcm47xxnflash_remove,
.driver = { .driver = {
.name = "bcma_nflash", .name = "bcma_nflash",
.owner = THIS_MODULE, .owner = THIS_MODULE,

7
drivers/mtd/nand/gpmi-nand/gpmi-nand.c
View File

@ -319,8 +319,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
return 0; return 0;
} }
static int static int acquire_register_block(struct gpmi_nand_data *this,
acquire_register_block(struct gpmi_nand_data *this, const char *res_name) const char *res_name)
{ {
struct platform_device *pdev = this->pdev; struct platform_device *pdev = this->pdev;
struct resources *res = &this->resources; struct resources *res = &this->resources;
@ -360,8 +360,7 @@ static void release_register_block(struct gpmi_nand_data *this)
res->bch_regs = NULL; res->bch_regs = NULL;
} }
static int static int acquire_bch_irq(struct gpmi_nand_data *this, irq_handler_t irq_h)
acquire_bch_irq(struct gpmi_nand_data *this, irq_handler_t irq_h)
{ {
struct platform_device *pdev = this->pdev; struct platform_device *pdev = this->pdev;
struct resources *res = &this->resources; struct resources *res = &this->resources;

3
drivers/mtd/nand/jz4740_nand.c
View File

@ -326,7 +326,8 @@ static inline void jz_nand_iounmap_resource(struct resource *res,
static int jz_nand_detect_bank(struct platform_device *pdev, static int jz_nand_detect_bank(struct platform_device *pdev,
struct jz_nand *nand, unsigned char bank, struct jz_nand *nand, unsigned char bank,
size_t chipnr, uint8_t *nand_maf_id, size_t chipnr, uint8_t *nand_maf_id,
uint8_t *nand_dev_id) { uint8_t *nand_dev_id)
{
int ret; int ret;
int gpio; int gpio;
char gpio_name[9]; char gpio_name[9];