Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: remove use of __devexit

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>

authored by

Bill Pemberton and committed by
Artem Bityutskiy
810b7e06 5e75e86e

+50 -50
+1 -1
drivers/mtd/devices/bcm47xxsflash.c
··· 66 66 return err; 67 67 } 68 68 69 - static int __devexit bcm47xxsflash_remove(struct platform_device *pdev) 69 + static int bcm47xxsflash_remove(struct platform_device *pdev) 70 70 { 71 71 struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev); 72 72
+1 -1
drivers/mtd/devices/block2mtd.c
··· 433 433 } 434 434 435 435 436 - static void __devexit block2mtd_exit(void) 436 + static void block2mtd_exit(void) 437 437 { 438 438 struct list_head *pos, *next; 439 439
+1 -1
drivers/mtd/devices/m25p80.c
··· 972 972 } 973 973 974 974 975 - static int __devexit m25p_remove(struct spi_device *spi) 975 + static int m25p_remove(struct spi_device *spi) 976 976 { 977 977 struct m25p *flash = dev_get_drvdata(&spi->dev); 978 978 int status;
+1 -1
drivers/mtd/devices/mtd_dataflash.c
··· 897 897 return status; 898 898 } 899 899 900 - static int __devexit dataflash_remove(struct spi_device *spi) 900 + static int dataflash_remove(struct spi_device *spi) 901 901 { 902 902 struct dataflash *flash = dev_get_drvdata(&spi->dev); 903 903 int status;
+1 -1
drivers/mtd/devices/spear_smi.c
··· 1016 1016 * 1017 1017 * free all allocations and delete the partitions. 1018 1018 */ 1019 - static int __devexit spear_smi_remove(struct platform_device *pdev) 1019 + static int spear_smi_remove(struct platform_device *pdev) 1020 1020 { 1021 1021 struct spear_smi *dev; 1022 1022 struct spear_snor_flash *flash;
+1 -1
drivers/mtd/devices/sst25l.c
··· 411 411 return 0; 412 412 } 413 413 414 - static int __devexit sst25l_remove(struct spi_device *spi) 414 + static int sst25l_remove(struct spi_device *spi) 415 415 { 416 416 struct sst25l_flash *flash = dev_get_drvdata(&spi->dev); 417 417 int ret;
+1 -1
drivers/mtd/maps/amd76xrom.c
··· 289 289 } 290 290 291 291 292 - static void __devexit amd76xrom_remove_one (struct pci_dev *pdev) 292 + static void amd76xrom_remove_one (struct pci_dev *pdev) 293 293 { 294 294 struct amd76xrom_window *window = &amd76xrom_window; 295 295
+1 -1
drivers/mtd/maps/autcpu12-nvram.c
··· 105 105 return -ENOMEM; 106 106 } 107 107 108 - static int __devexit autcpu12_nvram_remove(struct platform_device *pdev) 108 + static int autcpu12_nvram_remove(struct platform_device *pdev) 109 109 { 110 110 struct autcpu12_nvram_priv *priv = platform_get_drvdata(pdev); 111 111
+1 -1
drivers/mtd/maps/bfin-async-flash.c
··· 172 172 return 0; 173 173 } 174 174 175 - static int __devexit bfin_flash_remove(struct platform_device *pdev) 175 + static int bfin_flash_remove(struct platform_device *pdev) 176 176 { 177 177 struct async_state *state = platform_get_drvdata(pdev); 178 178 gpio_free(state->enet_flash_pin);
+1 -1
drivers/mtd/maps/ck804xrom.c
··· 320 320 } 321 321 322 322 323 - static void __devexit ck804xrom_remove_one (struct pci_dev *pdev) 323 + static void ck804xrom_remove_one (struct pci_dev *pdev) 324 324 { 325 325 struct ck804xrom_window *window = &ck804xrom_window; 326 326
+1 -1
drivers/mtd/maps/esb2rom.c
··· 378 378 return 0; 379 379 } 380 380 381 - static void __devexit esb2rom_remove_one (struct pci_dev *pdev) 381 + static void esb2rom_remove_one (struct pci_dev *pdev) 382 382 { 383 383 struct esb2rom_window *window = &esb2rom_window; 384 384 esb2rom_cleanup(window);
+1 -1
drivers/mtd/maps/gpio-addr-flash.c
··· 258 258 return 0; 259 259 } 260 260 261 - static int __devexit gpio_flash_remove(struct platform_device *pdev) 261 + static int gpio_flash_remove(struct platform_device *pdev) 262 262 { 263 263 struct async_state *state = platform_get_drvdata(pdev); 264 264 size_t i = 0;
+1 -1
drivers/mtd/maps/ichxrom.c
··· 315 315 } 316 316 317 317 318 - static void __devexit ichxrom_remove_one (struct pci_dev *pdev) 318 + static void ichxrom_remove_one (struct pci_dev *pdev) 319 319 { 320 320 struct ichxrom_window *window = &ichxrom_window; 321 321 ichxrom_cleanup(window);
+4 -4
drivers/mtd/maps/intel_vr_nor.c
··· 63 63 #define TIMING_BYTE_EN (1 << 0) /* 8-bit vs 16-bit bus */ 64 64 #define TIMING_MASK 0x3FFF0000 65 65 66 - static void __devexit vr_nor_destroy_partitions(struct vr_nor_mtd *p) 66 + static void vr_nor_destroy_partitions(struct vr_nor_mtd *p) 67 67 { 68 68 mtd_device_unregister(p->info); 69 69 } ··· 75 75 return mtd_device_parse_register(p->info, NULL, NULL, NULL, 0); 76 76 } 77 77 78 - static void __devexit vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p) 78 + static void vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p) 79 79 { 80 80 map_destroy(p->info); 81 81 } ··· 96 96 return 0; 97 97 } 98 98 99 - static void __devexit vr_nor_destroy_maps(struct vr_nor_mtd *p) 99 + static void vr_nor_destroy_maps(struct vr_nor_mtd *p) 100 100 { 101 101 unsigned int exp_timing_cs0; 102 102 ··· 176 176 {0,} 177 177 }; 178 178 179 - static void __devexit vr_nor_pci_remove(struct pci_dev *dev) 179 + static void vr_nor_pci_remove(struct pci_dev *dev) 180 180 { 181 181 struct vr_nor_mtd *p = pci_get_drvdata(dev); 182 182
+1 -1
drivers/mtd/maps/lantiq-flash.c
··· 185 185 return err; 186 186 } 187 187 188 - static int __devexit 188 + static int 189 189 ltq_mtd_remove(struct platform_device *pdev) 190 190 { 191 191 struct ltq_mtd *ltq_mtd = platform_get_drvdata(pdev);
+1 -1
drivers/mtd/maps/pci.c
··· 308 308 return err; 309 309 } 310 310 311 - static void __devexit 311 + static void 312 312 mtd_pci_remove(struct pci_dev *dev) 313 313 { 314 314 struct mtd_info *mtd = pci_get_drvdata(dev);
+1 -1
drivers/mtd/maps/pismo.c
··· 197 197 } 198 198 } 199 199 200 - static int __devexit pismo_remove(struct i2c_client *client) 200 + static int pismo_remove(struct i2c_client *client) 201 201 { 202 202 struct pismo_data *pismo = i2c_get_clientdata(client); 203 203 int i;
+1 -1
drivers/mtd/maps/pxa2xx-flash.c
··· 105 105 return 0; 106 106 } 107 107 108 - static int __devexit pxa2xx_flash_remove(struct platform_device *dev) 108 + static int pxa2xx_flash_remove(struct platform_device *dev) 109 109 { 110 110 struct pxa2xx_flash_info *info = platform_get_drvdata(dev); 111 111
+1 -1
drivers/mtd/maps/scb2_flash.c
··· 197 197 return 0; 198 198 } 199 199 200 - static void __devexit 200 + static void 201 201 scb2_flash_remove(struct pci_dev *dev) 202 202 { 203 203 if (!scb2_mtd)
+1 -1
drivers/mtd/maps/sun_uflash.c
··· 121 121 return uflash_devinit(op, dp); 122 122 } 123 123 124 - static int __devexit uflash_remove(struct platform_device *op) 124 + static int uflash_remove(struct platform_device *op) 125 125 { 126 126 struct uflash_dev *up = dev_get_drvdata(&op->dev); 127 127
+2 -2
drivers/mtd/maps/vmu-flash.c
··· 690 690 return error; 691 691 } 692 692 693 - static void __devexit vmu_disconnect(struct maple_device *mdev) 693 + static void vmu_disconnect(struct maple_device *mdev) 694 694 { 695 695 struct memcard *card; 696 696 struct mdev_part *mpart; ··· 789 789 return 0; 790 790 } 791 791 792 - static int __devexit remove_maple_vmu(struct device *dev) 792 + static int remove_maple_vmu(struct device *dev) 793 793 { 794 794 struct maple_device *mdev = to_maple_dev(dev); 795 795
+1 -1
drivers/mtd/nand/ams-delta.c
··· 270 270 /* 271 271 * Clean up routine 272 272 */ 273 - static int __devexit ams_delta_cleanup(struct platform_device *pdev) 273 + static int ams_delta_cleanup(struct platform_device *pdev) 274 274 { 275 275 void __iomem *io_base = platform_get_drvdata(pdev); 276 276
+1 -1
drivers/mtd/nand/au1550nd.c
··· 491 491 return ret; 492 492 } 493 493 494 - static int __devexit au1550nd_remove(struct platform_device *pdev) 494 + static int au1550nd_remove(struct platform_device *pdev) 495 495 { 496 496 struct au1550nd_ctx *ctx = platform_get_drvdata(pdev); 497 497 struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+1 -1
drivers/mtd/nand/bf5xx_nand.c
··· 667 667 return mtd_device_register(mtd, parts, nr); 668 668 } 669 669 670 - static int __devexit bf5xx_nand_remove(struct platform_device *pdev) 670 + static int bf5xx_nand_remove(struct platform_device *pdev) 671 671 { 672 672 struct bf5xx_nand_info *info = to_nand_info(pdev); 673 673
+1 -1
drivers/mtd/nand/cafe_nand.c
··· 821 821 return err; 822 822 } 823 823 824 - static void __devexit cafe_nand_remove(struct pci_dev *pdev) 824 + static void cafe_nand_remove(struct pci_dev *pdev) 825 825 { 826 826 struct mtd_info *mtd = pci_get_drvdata(pdev); 827 827 struct cafe_priv *cafe = mtd->priv;
+1 -1
drivers/mtd/nand/denali_dt.c
··· 129 129 return ret; 130 130 } 131 131 132 - static int __devexit denali_dt_remove(struct platform_device *ofdev) 132 + static int denali_dt_remove(struct platform_device *ofdev) 133 133 { 134 134 struct denali_dt *dt = platform_get_drvdata(ofdev); 135 135
+1 -1
drivers/mtd/nand/denali_pci.c
··· 137 137 } 138 138 module_init(denali_init_pci); 139 139 140 - static void __devexit denali_exit_pci(void) 140 + static void denali_exit_pci(void) 141 141 { 142 142 pci_unregister_driver(&denali_pci_driver); 143 143 }
+1 -1
drivers/mtd/nand/fsl_upm.c
··· 318 318 return ret; 319 319 } 320 320 321 - static int __devexit fun_remove(struct platform_device *ofdev) 321 + static int fun_remove(struct platform_device *ofdev) 322 322 { 323 323 struct fsl_upm_nand *fun = dev_get_drvdata(&ofdev->dev); 324 324 int i;
+1 -1
drivers/mtd/nand/gpio.c
··· 231 231 return platform_get_resource(pdev, IORESOURCE_MEM, 1); 232 232 } 233 233 234 - static int __devexit gpio_nand_remove(struct platform_device *dev) 234 + static int gpio_nand_remove(struct platform_device *dev) 235 235 { 236 236 struct gpiomtd *gpiomtd = platform_get_drvdata(dev); 237 237 struct resource *res;
+1 -1
drivers/mtd/nand/gpmi-nand/gpmi-nand.c
··· 1675 1675 return ret; 1676 1676 } 1677 1677 1678 - static int __devexit gpmi_nand_remove(struct platform_device *pdev) 1678 + static int gpmi_nand_remove(struct platform_device *pdev) 1679 1679 { 1680 1680 struct gpmi_nand_data *this = platform_get_drvdata(pdev); 1681 1681
+1 -1
drivers/mtd/nand/jz4740_nand.c
··· 541 541 return ret; 542 542 } 543 543 544 - static int __devexit jz_nand_remove(struct platform_device *pdev) 544 + static int jz_nand_remove(struct platform_device *pdev) 545 545 { 546 546 struct jz_nand *nand = platform_get_drvdata(pdev); 547 547 struct jz_nand_platform_data *pdata = pdev->dev.platform_data;
+1 -1
drivers/mtd/nand/lpc32xx_mlc.c
··· 845 845 /* 846 846 * Remove NAND device 847 847 */ 848 - static int __devexit lpc32xx_nand_remove(struct platform_device *pdev) 848 + static int lpc32xx_nand_remove(struct platform_device *pdev) 849 849 { 850 850 struct lpc32xx_nand_host *host = platform_get_drvdata(pdev); 851 851 struct mtd_info *mtd = &host->mtd;
+1 -1
drivers/mtd/nand/lpc32xx_slc.c
··· 949 949 /* 950 950 * Remove NAND device. 951 951 */ 952 - static int __devexit lpc32xx_nand_remove(struct platform_device *pdev) 952 + static int lpc32xx_nand_remove(struct platform_device *pdev) 953 953 { 954 954 uint32_t tmp; 955 955 struct lpc32xx_nand_host *host = platform_get_drvdata(pdev);
+1 -1
drivers/mtd/nand/mpc5121_nfc.c
··· 827 827 return retval; 828 828 } 829 829 830 - static int __devexit mpc5121_nfc_remove(struct platform_device *op) 830 + static int mpc5121_nfc_remove(struct platform_device *op) 831 831 { 832 832 struct device *dev = &op->dev; 833 833 struct mtd_info *mtd = dev_get_drvdata(dev);
+1 -1
drivers/mtd/nand/mxc_nand.c
··· 1538 1538 return err; 1539 1539 } 1540 1540 1541 - static int __devexit mxcnd_remove(struct platform_device *pdev) 1541 + static int mxcnd_remove(struct platform_device *pdev) 1542 1542 { 1543 1543 struct mxc_nand_host *host = platform_get_drvdata(pdev); 1544 1544
+1 -1
drivers/mtd/nand/ndfc.c
··· 256 256 return 0; 257 257 } 258 258 259 - static int __devexit ndfc_remove(struct platform_device *ofdev) 259 + static int ndfc_remove(struct platform_device *ofdev) 260 260 { 261 261 struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev); 262 262
+1 -1
drivers/mtd/nand/nuc900_nand.c
··· 317 317 return retval; 318 318 } 319 319 320 - static int __devexit nuc900_nand_remove(struct platform_device *pdev) 320 + static int nuc900_nand_remove(struct platform_device *pdev) 321 321 { 322 322 struct nuc900_nand *nuc900_nand = platform_get_drvdata(pdev); 323 323 struct resource *res;
+1 -1
drivers/mtd/nand/orion_nand.c
··· 194 194 return ret; 195 195 } 196 196 197 - static int __devexit orion_nand_remove(struct platform_device *pdev) 197 + static int orion_nand_remove(struct platform_device *pdev) 198 198 { 199 199 struct mtd_info *mtd = platform_get_drvdata(pdev); 200 200 struct nand_chip *nc = mtd->priv;
+1 -1
drivers/mtd/nand/pasemi_nand.c
··· 184 184 return err; 185 185 } 186 186 187 - static int __devexit pasemi_nand_remove(struct platform_device *ofdev) 187 + static int pasemi_nand_remove(struct platform_device *ofdev) 188 188 { 189 189 struct nand_chip *chip; 190 190
+1 -1
drivers/mtd/nand/plat_nand.c
··· 134 134 /* 135 135 * Remove a NAND device. 136 136 */ 137 - static int __devexit plat_nand_remove(struct platform_device *pdev) 137 + static int plat_nand_remove(struct platform_device *pdev) 138 138 { 139 139 struct plat_nand_data *data = platform_get_drvdata(pdev); 140 140 struct platform_nand_data *pdata = pdev->dev.platform_data;
+1 -1
drivers/mtd/nand/sh_flctl.c
··· 1198 1198 return ret; 1199 1199 } 1200 1200 1201 - static int __devexit flctl_remove(struct platform_device *pdev) 1201 + static int flctl_remove(struct platform_device *pdev) 1202 1202 { 1203 1203 struct sh_flctl *flctl = platform_get_drvdata(pdev); 1204 1204
+1 -1
drivers/mtd/nand/sharpsl.c
··· 205 205 /* 206 206 * Clean up routine 207 207 */ 208 - static int __devexit sharpsl_nand_remove(struct platform_device *pdev) 208 + static int sharpsl_nand_remove(struct platform_device *pdev) 209 209 { 210 210 struct sharpsl_nand *sharpsl = platform_get_drvdata(pdev); 211 211
+1 -1
drivers/mtd/nand/socrates_nand.c
··· 220 220 /* 221 221 * Remove a NAND device. 222 222 */ 223 - static int __devexit socrates_nand_remove(struct platform_device *ofdev) 223 + static int socrates_nand_remove(struct platform_device *ofdev) 224 224 { 225 225 struct socrates_nand_host *host = dev_get_drvdata(&ofdev->dev); 226 226 struct mtd_info *mtd = &host->mtd;
+1 -1
drivers/mtd/onenand/generic.c
··· 88 88 return err; 89 89 } 90 90 91 - static int __devexit generic_onenand_remove(struct platform_device *pdev) 91 + static int generic_onenand_remove(struct platform_device *pdev) 92 92 { 93 93 struct onenand_info *info = platform_get_drvdata(pdev); 94 94 struct resource *res = pdev->resource;
+1 -1
drivers/mtd/onenand/omap2.c
··· 787 787 return r; 788 788 } 789 789 790 - static int __devexit omap2_onenand_remove(struct platform_device *pdev) 790 + static int omap2_onenand_remove(struct platform_device *pdev) 791 791 { 792 792 struct omap2_onenand *c = dev_get_drvdata(&pdev->dev); 793 793
+1 -1
drivers/mtd/onenand/samsung.c
··· 1053 1053 return err; 1054 1054 } 1055 1055 1056 - static int __devexit s3c_onenand_remove(struct platform_device *pdev) 1056 + static int s3c_onenand_remove(struct platform_device *pdev) 1057 1057 { 1058 1058 struct mtd_info *mtd = platform_get_drvdata(pdev); 1059 1059