Skip to content

Commit

Permalink
mtd: remove use of __devexit
Browse files Browse the repository at this point in the history 
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Bill Pemberton authored and Artem Bityutskiy committed Nov 22, 2012
1 parent 5e75e86 commit 810b7e0
Show file tree
Hide file tree
Showing 46 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion drivers/mtd/devices/bcm47xxsflash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static int bcm47xxsflash_probe(struct platform_device *pdev)
return err;
}

static int __devexit bcm47xxsflash_remove(struct platform_device *pdev)
static int bcm47xxsflash_remove(struct platform_device *pdev)
{
struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/devices/block2mtd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ static int __init block2mtd_init(void)
}


static void __devexit block2mtd_exit(void)
static void block2mtd_exit(void)
{
struct list_head *pos, *next;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/devices/m25p80.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ static int m25p_probe(struct spi_device *spi)
}


static int __devexit m25p_remove(struct spi_device *spi)
static int m25p_remove(struct spi_device *spi)
{
struct m25p *flash = dev_get_drvdata(&spi->dev);
int status;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/devices/mtd_dataflash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ static int dataflash_probe(struct spi_device *spi)
return status;
}

static int __devexit dataflash_remove(struct spi_device *spi)
static int dataflash_remove(struct spi_device *spi)
{
struct dataflash *flash = dev_get_drvdata(&spi->dev);
int status;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/devices/spear_smi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ static int spear_smi_probe(struct platform_device *pdev)
*
* free all allocations and delete the partitions.
*/
static int __devexit spear_smi_remove(struct platform_device *pdev)
static int spear_smi_remove(struct platform_device *pdev)
{
struct spear_smi *dev;
struct spear_snor_flash *flash;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/devices/sst25l.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ static int sst25l_probe(struct spi_device *spi)
return 0;
}

static int __devexit sst25l_remove(struct spi_device *spi)
static int sst25l_remove(struct spi_device *spi)
{
struct sst25l_flash *flash = dev_get_drvdata(&spi->dev);
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/amd76xrom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static int amd76xrom_init_one (struct pci_dev *pdev,
}


static void __devexit amd76xrom_remove_one (struct pci_dev *pdev)
static void amd76xrom_remove_one (struct pci_dev *pdev)
{
struct amd76xrom_window *window = &amd76xrom_window;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/autcpu12-nvram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static int autcpu12_nvram_probe(struct platform_device *pdev)
return -ENOMEM;
}

static int __devexit autcpu12_nvram_remove(struct platform_device *pdev)
static int autcpu12_nvram_remove(struct platform_device *pdev)
{
struct autcpu12_nvram_priv *priv = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/bfin-async-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static int bfin_flash_probe(struct platform_device *pdev)
return 0;
}

static int __devexit bfin_flash_remove(struct platform_device *pdev)
static int bfin_flash_remove(struct platform_device *pdev)
{
struct async_state *state = platform_get_drvdata(pdev);
gpio_free(state->enet_flash_pin);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/ck804xrom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static int ck804xrom_init_one (struct pci_dev *pdev,
}


static void __devexit ck804xrom_remove_one (struct pci_dev *pdev)
static void ck804xrom_remove_one (struct pci_dev *pdev)
{
struct ck804xrom_window *window = &ck804xrom_window;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/esb2rom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ static int esb2rom_init_one(struct pci_dev *pdev,
return 0;
}

static void __devexit esb2rom_remove_one (struct pci_dev *pdev)
static void esb2rom_remove_one (struct pci_dev *pdev)
{
struct esb2rom_window *window = &esb2rom_window;
esb2rom_cleanup(window);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/gpio-addr-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
return 0;
}

static int __devexit gpio_flash_remove(struct platform_device *pdev)
static int gpio_flash_remove(struct platform_device *pdev)
{
struct async_state *state = platform_get_drvdata(pdev);
size_t i = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/ichxrom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ static int ichxrom_init_one (struct pci_dev *pdev,
}


static void __devexit ichxrom_remove_one (struct pci_dev *pdev)
static void ichxrom_remove_one (struct pci_dev *pdev)
{
struct ichxrom_window *window = &ichxrom_window;
ichxrom_cleanup(window);
Expand Down
8 changes: 4 additions & 4 deletions drivers/mtd/maps/intel_vr_nor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ struct vr_nor_mtd {
#define TIMING_BYTE_EN (1 << 0) /* 8-bit vs 16-bit bus */
#define TIMING_MASK 0x3FFF0000

static void __devexit vr_nor_destroy_partitions(struct vr_nor_mtd *p)
static void vr_nor_destroy_partitions(struct vr_nor_mtd *p)
{
mtd_device_unregister(p->info);
}
Expand All @@ -75,7 +75,7 @@ static int vr_nor_init_partitions(struct vr_nor_mtd *p)
return mtd_device_parse_register(p->info, NULL, NULL, NULL, 0);
}

static void __devexit vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p)
static void vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p)
{
map_destroy(p->info);
}
Expand All @@ -96,7 +96,7 @@ static int vr_nor_mtd_setup(struct vr_nor_mtd *p)
return 0;
}

static void __devexit vr_nor_destroy_maps(struct vr_nor_mtd *p)
static void vr_nor_destroy_maps(struct vr_nor_mtd *p)
{
unsigned int exp_timing_cs0;

Expand Down Expand Up @@ -176,7 +176,7 @@ static struct pci_device_id vr_nor_pci_ids[] = {
{0,}
};

static void __devexit vr_nor_pci_remove(struct pci_dev *dev)
static void vr_nor_pci_remove(struct pci_dev *dev)
{
struct vr_nor_mtd *p = pci_get_drvdata(dev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/lantiq-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ ltq_mtd_probe(struct platform_device *pdev)
return err;
}

static int __devexit
static int
ltq_mtd_remove(struct platform_device *pdev)
{
struct ltq_mtd *ltq_mtd = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
return err;
}

static void __devexit
static void
mtd_pci_remove(struct pci_dev *dev)
{
struct mtd_info *mtd = pci_get_drvdata(dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/pismo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static void pismo_add_one(struct pismo_data *pismo, int i,
}
}

static int __devexit pismo_remove(struct i2c_client *client)
static int pismo_remove(struct i2c_client *client)
{
struct pismo_data *pismo = i2c_get_clientdata(client);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/pxa2xx-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
return 0;
}

static int __devexit pxa2xx_flash_remove(struct platform_device *dev)
static int pxa2xx_flash_remove(struct platform_device *dev)
{
struct pxa2xx_flash_info *info = platform_get_drvdata(dev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/scb2_flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
return 0;
}

static void __devexit
static void
scb2_flash_remove(struct pci_dev *dev)
{
if (!scb2_mtd)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/sun_uflash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static int uflash_probe(struct platform_device *op)
return uflash_devinit(op, dp);
}

static int __devexit uflash_remove(struct platform_device *op)
static int uflash_remove(struct platform_device *op)
{
struct uflash_dev *up = dev_get_drvdata(&op->dev);

Expand Down
4 changes: 2 additions & 2 deletions drivers/mtd/maps/vmu-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ static int vmu_connect(struct maple_device *mdev)
return error;
}

static void __devexit vmu_disconnect(struct maple_device *mdev)
static void vmu_disconnect(struct maple_device *mdev)
{
struct memcard *card;
struct mdev_part *mpart;
Expand Down Expand Up @@ -789,7 +789,7 @@ static int probe_maple_vmu(struct device *dev)
return 0;
}

static int __devexit remove_maple_vmu(struct device *dev)
static int remove_maple_vmu(struct device *dev)
{
struct maple_device *mdev = to_maple_dev(dev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/ams-delta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ static int ams_delta_init(struct platform_device *pdev)
/*
* Clean up routine
*/
static int __devexit ams_delta_cleanup(struct platform_device *pdev)
static int ams_delta_cleanup(struct platform_device *pdev)
{
void __iomem *io_base = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/au1550nd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ static int au1550nd_probe(struct platform_device *pdev)
return ret;
}

static int __devexit au1550nd_remove(struct platform_device *pdev)
static int au1550nd_remove(struct platform_device *pdev)
{
struct au1550nd_ctx *ctx = platform_get_drvdata(pdev);
struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/bf5xx_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ static int bf5xx_nand_add_partition(struct bf5xx_nand_info *info)
return mtd_device_register(mtd, parts, nr);
}

static int __devexit bf5xx_nand_remove(struct platform_device *pdev)
static int bf5xx_nand_remove(struct platform_device *pdev)
{
struct bf5xx_nand_info *info = to_nand_info(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/cafe_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ static int cafe_nand_probe(struct pci_dev *pdev,
return err;
}

static void __devexit cafe_nand_remove(struct pci_dev *pdev)
static void cafe_nand_remove(struct pci_dev *pdev)
{
struct mtd_info *mtd = pci_get_drvdata(pdev);
struct cafe_priv *cafe = mtd->priv;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/denali_dt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static int denali_dt_probe(struct platform_device *ofdev)
return ret;
}

static int __devexit denali_dt_remove(struct platform_device *ofdev)
static int denali_dt_remove(struct platform_device *ofdev)
{
struct denali_dt *dt = platform_get_drvdata(ofdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/denali_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static int denali_init_pci(void)
}
module_init(denali_init_pci);

static void __devexit denali_exit_pci(void)
static void denali_exit_pci(void)
{
pci_unregister_driver(&denali_pci_driver);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/fsl_upm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ static int fun_probe(struct platform_device *ofdev)
return ret;
}

static int __devexit fun_remove(struct platform_device *ofdev)
static int fun_remove(struct platform_device *ofdev)
{
struct fsl_upm_nand *fun = dev_get_drvdata(&ofdev->dev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ gpio_nand_get_io_sync(struct platform_device *pdev)
return platform_get_resource(pdev, IORESOURCE_MEM, 1);
}

static int __devexit gpio_nand_remove(struct platform_device *dev)
static int gpio_nand_remove(struct platform_device *dev)
{
struct gpiomtd *gpiomtd = platform_get_drvdata(dev);
struct resource *res;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/gpmi-nand/gpmi-nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ static int gpmi_nand_probe(struct platform_device *pdev)
return ret;
}

static int __devexit gpmi_nand_remove(struct platform_device *pdev)
static int gpmi_nand_remove(struct platform_device *pdev)
{
struct gpmi_nand_data *this = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/jz4740_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ static int jz_nand_probe(struct platform_device *pdev)
return ret;
}

static int __devexit jz_nand_remove(struct platform_device *pdev)
static int jz_nand_remove(struct platform_device *pdev)
{
struct jz_nand *nand = platform_get_drvdata(pdev);
struct jz_nand_platform_data *pdata = pdev->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/lpc32xx_mlc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
/*
* Remove NAND device
*/
static int __devexit lpc32xx_nand_remove(struct platform_device *pdev)
static int lpc32xx_nand_remove(struct platform_device *pdev)
{
struct lpc32xx_nand_host *host = platform_get_drvdata(pdev);
struct mtd_info *mtd = &host->mtd;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/lpc32xx_slc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
/*
* Remove NAND device.
*/
static int __devexit lpc32xx_nand_remove(struct platform_device *pdev)
static int lpc32xx_nand_remove(struct platform_device *pdev)
{
uint32_t tmp;
struct lpc32xx_nand_host *host = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/mpc5121_nfc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ static int mpc5121_nfc_probe(struct platform_device *op)
return retval;
}

static int __devexit mpc5121_nfc_remove(struct platform_device *op)
static int mpc5121_nfc_remove(struct platform_device *op)
{
struct device *dev = &op->dev;
struct mtd_info *mtd = dev_get_drvdata(dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/mxc_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@ static int mxcnd_probe(struct platform_device *pdev)
return err;
}

static int __devexit mxcnd_remove(struct platform_device *pdev)
static int mxcnd_remove(struct platform_device *pdev)
{
struct mxc_nand_host *host = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/ndfc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int ndfc_probe(struct platform_device *ofdev)
return 0;
}

static int __devexit ndfc_remove(struct platform_device *ofdev)
static int ndfc_remove(struct platform_device *ofdev)
{
struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/nuc900_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ fail1: kfree(nuc900_nand);
return retval;
}

static int __devexit nuc900_nand_remove(struct platform_device *pdev)
static int nuc900_nand_remove(struct platform_device *pdev)
{
struct nuc900_nand *nuc900_nand = platform_get_drvdata(pdev);
struct resource *res;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/orion_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ static int __init orion_nand_probe(struct platform_device *pdev)
return ret;
}

static int __devexit orion_nand_remove(struct platform_device *pdev)
static int orion_nand_remove(struct platform_device *pdev)
{
struct mtd_info *mtd = platform_get_drvdata(pdev);
struct nand_chip *nc = mtd->priv;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/pasemi_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev)
return err;
}

static int __devexit pasemi_nand_remove(struct platform_device *ofdev)
static int pasemi_nand_remove(struct platform_device *ofdev)
{
struct nand_chip *chip;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/plat_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static int plat_nand_probe(struct platform_device *pdev)
/*
* Remove a NAND device.
*/
static int __devexit plat_nand_remove(struct platform_device *pdev)
static int plat_nand_remove(struct platform_device *pdev)
{
struct plat_nand_data *data = platform_get_drvdata(pdev);
struct platform_nand_data *pdata = pdev->dev.platform_data;
Expand Down
Loading

0 comments on commit 810b7e0

Please sign in to comment.