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

misc: remove use of __devinit

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

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Bill Pemberton and committed by
Greg Kroah-Hartman
80c8ae28 2d6bed9c

+36 -36
+1 -1
drivers/misc/ad525x_dpot-i2c.c
··· 51 51 .write_r8d16 = write_r8d16, 52 52 }; 53 53 54 - static int __devinit ad_dpot_i2c_probe(struct i2c_client *client, 54 + static int ad_dpot_i2c_probe(struct i2c_client *client, 55 55 const struct i2c_device_id *id) 56 56 { 57 57 struct ad_dpot_bus_data bdata = {
+1 -1
drivers/misc/ad525x_dpot-spi.c
··· 75 75 .write_r8d8 = write16, 76 76 .write_r8d16 = write24, 77 77 }; 78 - static int __devinit ad_dpot_spi_probe(struct spi_device *spi) 78 + static int ad_dpot_spi_probe(struct spi_device *spi) 79 79 { 80 80 struct ad_dpot_bus_data bdata = { 81 81 .client = spi,
+2 -2
drivers/misc/ad525x_dpot.c
··· 641 641 .attrs = ad525x_attributes_commands, 642 642 }; 643 643 644 - __devinit int ad_dpot_add_files(struct device *dev, 644 + int ad_dpot_add_files(struct device *dev, 645 645 unsigned features, unsigned rdac) 646 646 { 647 647 int err = sysfs_create_file(&dev->kobj, ··· 685 685 } 686 686 } 687 687 688 - int __devinit ad_dpot_probe(struct device *dev, 688 + int ad_dpot_probe(struct device *dev, 689 689 struct ad_dpot_bus_data *bdata, unsigned long devid, 690 690 const char *name) 691 691 {
+1 -1
drivers/misc/apds990x.c
··· 1047 1047 {.attrs = sysfs_attrs_ctrl }, 1048 1048 }; 1049 1049 1050 - static int __devinit apds990x_probe(struct i2c_client *client, 1050 + static int apds990x_probe(struct i2c_client *client, 1051 1051 const struct i2c_device_id *id) 1052 1052 { 1053 1053 struct apds990x_chip *chip;
+1 -1
drivers/misc/bh1770glc.c
··· 1162 1162 .attrs = sysfs_attrs 1163 1163 }; 1164 1164 1165 - static int __devinit bh1770_probe(struct i2c_client *client, 1165 + static int bh1770_probe(struct i2c_client *client, 1166 1166 const struct i2c_device_id *id) 1167 1167 { 1168 1168 struct bh1770_chip *chip;
+1 -1
drivers/misc/bh1780gli.c
··· 144 144 .attrs = bh1780_attributes, 145 145 }; 146 146 147 - static int __devinit bh1780_probe(struct i2c_client *client, 147 + static int bh1780_probe(struct i2c_client *client, 148 148 const struct i2c_device_id *id) 149 149 { 150 150 int ret;
+1 -1
drivers/misc/bmp085-i2c.c
··· 36 36 return bmp085_detect(&client->dev); 37 37 } 38 38 39 - static int __devinit bmp085_i2c_probe(struct i2c_client *client, 39 + static int bmp085_i2c_probe(struct i2c_client *client, 40 40 const struct i2c_device_id *id) 41 41 { 42 42 int err;
+1 -1
drivers/misc/bmp085-spi.c
··· 22 22 #include <linux/err.h> 23 23 #include "bmp085.h" 24 24 25 - static int __devinit bmp085_spi_probe(struct spi_device *client) 25 + static int bmp085_spi_probe(struct spi_device *client) 26 26 { 27 27 int err; 28 28 struct regmap *regmap;
+1 -1
drivers/misc/bmp085.c
··· 420 420 }; 421 421 EXPORT_SYMBOL_GPL(bmp085_regmap_config); 422 422 423 - __devinit int bmp085_probe(struct device *dev, struct regmap *regmap) 423 + int bmp085_probe(struct device *dev, struct regmap *regmap) 424 424 { 425 425 struct bmp085_data *data; 426 426 int err = 0;
+3 -3
drivers/misc/cb710/core.c
··· 30 30 EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg); 31 31 32 32 /* Some magic writes based on Windows driver init code */ 33 - static int __devinit cb710_pci_configure(struct pci_dev *pdev) 33 + static int cb710_pci_configure(struct pci_dev *pdev) 34 34 { 35 35 unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0); 36 36 struct pci_dev *pdev0; ··· 96 96 #endif 97 97 } 98 98 99 - static int __devinit cb710_register_slot(struct cb710_chip *chip, 99 + static int cb710_register_slot(struct cb710_chip *chip, 100 100 unsigned slot_mask, unsigned io_offset, const char *name) 101 101 { 102 102 int nr = chip->slots; ··· 201 201 202 202 #endif /* CONFIG_PM */ 203 203 204 - static int __devinit cb710_probe(struct pci_dev *pdev, 204 + static int cb710_probe(struct pci_dev *pdev, 205 205 const struct pci_device_id *ent) 206 206 { 207 207 struct cb710_chip *chip;
+3 -3
drivers/misc/cs5535-mfgpt.c
··· 246 246 * Jordan tells me that he and Mitch once played w/ it, but it's unclear 247 247 * what the results of that were (and they experienced some instability). 248 248 */ 249 - static void __devinit reset_all_timers(void) 249 + static void reset_all_timers(void) 250 250 { 251 251 uint32_t val, dummy; 252 252 ··· 262 262 * In other cases (such as with VSAless OpenFirmware), the system firmware 263 263 * leaves timers available for us to use. 264 264 */ 265 - static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt) 265 + static int scan_timers(struct cs5535_mfgpt_chip *mfgpt) 266 266 { 267 267 struct cs5535_mfgpt_timer timer = { .chip = mfgpt }; 268 268 unsigned long flags; ··· 289 289 return timers; 290 290 } 291 291 292 - static int __devinit cs5535_mfgpt_probe(struct platform_device *pdev) 292 + static int cs5535_mfgpt_probe(struct platform_device *pdev) 293 293 { 294 294 struct resource *res; 295 295 int err = -EIO, t;
+1 -1
drivers/misc/eeprom/eeprom_93xx46.c
··· 309 309 } 310 310 static DEVICE_ATTR(erase, S_IWUSR, NULL, eeprom_93xx46_store_erase); 311 311 312 - static int __devinit eeprom_93xx46_probe(struct spi_device *spi) 312 + static int eeprom_93xx46_probe(struct spi_device *spi) 313 313 { 314 314 struct eeprom_93xx46_platform_data *pd; 315 315 struct eeprom_93xx46_dev *edev;
+1 -1
drivers/misc/fsa9480.c
··· 407 407 return 0; 408 408 } 409 409 410 - static int __devinit fsa9480_probe(struct i2c_client *client, 410 + static int fsa9480_probe(struct i2c_client *client, 411 411 const struct i2c_device_id *id) 412 412 { 413 413 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+2 -2
drivers/misc/hpilo.c
··· 686 686 pci_iounmap(pdev, hw->mmio_vaddr); 687 687 } 688 688 689 - static int __devinit ilo_map_device(struct pci_dev *pdev, struct ilo_hwinfo *hw) 689 + static int ilo_map_device(struct pci_dev *pdev, struct ilo_hwinfo *hw) 690 690 { 691 691 int error = -ENOMEM; 692 692 ··· 751 751 ilo_hwdev[(minor / max_ccb)] = 0; 752 752 } 753 753 754 - static int __devinit ilo_probe(struct pci_dev *pdev, 754 + static int ilo_probe(struct pci_dev *pdev, 755 755 const struct pci_device_id *ent) 756 756 { 757 757 int devnum, minor, start, error = 0;
+1 -1
drivers/misc/ibmasm/module.c
··· 62 62 MODULE_PARM_DESC(ibmasm_debug, " Set debug mode on or off"); 63 63 64 64 65 - static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 65 + static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 66 66 { 67 67 int result; 68 68 struct service_processor *sp;
+3 -3
drivers/misc/ioc4.c
··· 139 139 * even though the following code utilizes external interrupt registers 140 140 * to perform the speed calculation. 141 141 */ 142 - static void __devinit 142 + static void 143 143 ioc4_clock_calibrate(struct ioc4_driver_data *idd) 144 144 { 145 145 union ioc4_int_out int_out; ··· 231 231 * on the same PCI bus at slot number 3 to differentiate IO9 from IO10. 232 232 * If neither is present, it's a PCI-RT. 233 233 */ 234 - static unsigned int __devinit 234 + static unsigned int 235 235 ioc4_variant(struct ioc4_driver_data *idd) 236 236 { 237 237 struct pci_dev *pdev = NULL; ··· 279 279 static DECLARE_WORK(ioc4_load_modules_work, ioc4_load_modules); 280 280 281 281 /* Adds a new instance of an IOC4 card */ 282 - static int __devinit 282 + static int 283 283 ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) 284 284 { 285 285 struct ioc4_driver_data *idd;
+1 -1
drivers/misc/isl29003.c
··· 365 365 * I2C layer 366 366 */ 367 367 368 - static int __devinit isl29003_probe(struct i2c_client *client, 368 + static int isl29003_probe(struct i2c_client *client, 369 369 const struct i2c_device_id *id) 370 370 { 371 371 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+1 -1
drivers/misc/lis3lv02d/lis3lv02d_i2c.c
··· 114 114 MODULE_DEVICE_TABLE(of, lis3lv02d_i2c_dt_ids); 115 115 #endif 116 116 117 - static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client, 117 + static int lis3lv02d_i2c_probe(struct i2c_client *client, 118 118 const struct i2c_device_id *id) 119 119 { 120 120 int ret = 0;
+1 -1
drivers/misc/lis3lv02d/lis3lv02d_spi.c
··· 69 69 MODULE_DEVICE_TABLE(of, lis302dl_spi_dt_ids); 70 70 #endif 71 71 72 - static int __devinit lis302dl_spi_probe(struct spi_device *spi) 72 + static int lis302dl_spi_probe(struct spi_device *spi) 73 73 { 74 74 int ret; 75 75
+2 -2
drivers/misc/mei/main.c
··· 743 743 * 744 744 * returns true if ME Interface is valid, false otherwise 745 745 */ 746 - static bool __devinit mei_quirk_probe(struct pci_dev *pdev, 746 + static bool mei_quirk_probe(struct pci_dev *pdev, 747 747 const struct pci_device_id *ent) 748 748 { 749 749 u32 reg; ··· 765 765 * 766 766 * returns 0 on success, <0 on failure. 767 767 */ 768 - static int __devinit mei_probe(struct pci_dev *pdev, 768 + static int mei_probe(struct pci_dev *pdev, 769 769 const struct pci_device_id *ent) 770 770 { 771 771 struct mei_device *dev;
+1 -1
drivers/misc/pch_phub.c
··· 666 666 .write = pch_phub_bin_write, 667 667 }; 668 668 669 - static int __devinit pch_phub_probe(struct pci_dev *pdev, 669 + static int pch_phub_probe(struct pci_dev *pdev, 670 670 const struct pci_device_id *id) 671 671 { 672 672 int retval;
+2 -2
drivers/misc/phantom.c
··· 324 324 * Init and deinit driver 325 325 */ 326 326 327 - static unsigned int __devinit phantom_get_free(void) 327 + static unsigned int phantom_get_free(void) 328 328 { 329 329 unsigned int i; 330 330 ··· 335 335 return i; 336 336 } 337 337 338 - static int __devinit phantom_probe(struct pci_dev *pdev, 338 + static int phantom_probe(struct pci_dev *pdev, 339 339 const struct pci_device_id *pci_id) 340 340 { 341 341 struct phantom_device *pht;
+1 -1
drivers/misc/pti.c
··· 796 796 * 0 for success 797 797 * otherwise, error 798 798 */ 799 - static int __devinit pti_pci_probe(struct pci_dev *pdev, 799 + static int pti_pci_probe(struct pci_dev *pdev, 800 800 const struct pci_device_id *ent) 801 801 { 802 802 unsigned int a;
+1 -1
drivers/misc/spear13xx_pcie_gadget.c
··· 711 711 spear_dbi_write_reg(config, PCI_INTERRUPT_LINE, 1, 1); 712 712 } 713 713 714 - static int __devinit spear_pcie_gadget_probe(struct platform_device *pdev) 714 + static int spear_pcie_gadget_probe(struct platform_device *pdev) 715 715 { 716 716 struct resource *res0, *res1; 717 717 unsigned int status = 0;
+1 -1
drivers/misc/ti_dac7512.c
··· 54 54 .attrs = dac7512_attributes, 55 55 }; 56 56 57 - static int __devinit dac7512_probe(struct spi_device *spi) 57 + static int dac7512_probe(struct spi_device *spi) 58 58 { 59 59 int ret; 60 60
+1 -1
drivers/misc/tsl2550.c
··· 347 347 */ 348 348 349 349 static struct i2c_driver tsl2550_driver; 350 - static int __devinit tsl2550_probe(struct i2c_client *client, 350 + static int tsl2550_probe(struct i2c_client *client, 351 351 const struct i2c_device_id *id) 352 352 { 353 353 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);