Commit 80c8ae28 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

misc: remove use of __devinit

CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: default avatarBill 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d6bed9c
...@@ -51,7 +51,7 @@ static const struct ad_dpot_bus_ops bops = { ...@@ -51,7 +51,7 @@ static const struct ad_dpot_bus_ops bops = {
.write_r8d16 = write_r8d16, .write_r8d16 = write_r8d16,
}; };
static int __devinit ad_dpot_i2c_probe(struct i2c_client *client, static int ad_dpot_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct ad_dpot_bus_data bdata = { struct ad_dpot_bus_data bdata = {
......
...@@ -75,7 +75,7 @@ static const struct ad_dpot_bus_ops bops = { ...@@ -75,7 +75,7 @@ static const struct ad_dpot_bus_ops bops = {
.write_r8d8 = write16, .write_r8d8 = write16,
.write_r8d16 = write24, .write_r8d16 = write24,
}; };
static int __devinit ad_dpot_spi_probe(struct spi_device *spi) static int ad_dpot_spi_probe(struct spi_device *spi)
{ {
struct ad_dpot_bus_data bdata = { struct ad_dpot_bus_data bdata = {
.client = spi, .client = spi,
......
...@@ -641,7 +641,7 @@ static const struct attribute_group ad525x_group_commands = { ...@@ -641,7 +641,7 @@ static const struct attribute_group ad525x_group_commands = {
.attrs = ad525x_attributes_commands, .attrs = ad525x_attributes_commands,
}; };
__devinit int ad_dpot_add_files(struct device *dev, int ad_dpot_add_files(struct device *dev,
unsigned features, unsigned rdac) unsigned features, unsigned rdac)
{ {
int err = sysfs_create_file(&dev->kobj, int err = sysfs_create_file(&dev->kobj,
...@@ -685,7 +685,7 @@ inline void ad_dpot_remove_files(struct device *dev, ...@@ -685,7 +685,7 @@ inline void ad_dpot_remove_files(struct device *dev,
} }
} }
int __devinit ad_dpot_probe(struct device *dev, int ad_dpot_probe(struct device *dev,
struct ad_dpot_bus_data *bdata, unsigned long devid, struct ad_dpot_bus_data *bdata, unsigned long devid,
const char *name) const char *name)
{ {
......
...@@ -1047,7 +1047,7 @@ static struct attribute_group apds990x_attribute_group[] = { ...@@ -1047,7 +1047,7 @@ static struct attribute_group apds990x_attribute_group[] = {
{.attrs = sysfs_attrs_ctrl }, {.attrs = sysfs_attrs_ctrl },
}; };
static int __devinit apds990x_probe(struct i2c_client *client, static int apds990x_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct apds990x_chip *chip; struct apds990x_chip *chip;
......
...@@ -1162,7 +1162,7 @@ static struct attribute_group bh1770_attribute_group = { ...@@ -1162,7 +1162,7 @@ static struct attribute_group bh1770_attribute_group = {
.attrs = sysfs_attrs .attrs = sysfs_attrs
}; };
static int __devinit bh1770_probe(struct i2c_client *client, static int bh1770_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct bh1770_chip *chip; struct bh1770_chip *chip;
......
...@@ -144,7 +144,7 @@ static const struct attribute_group bh1780_attr_group = { ...@@ -144,7 +144,7 @@ static const struct attribute_group bh1780_attr_group = {
.attrs = bh1780_attributes, .attrs = bh1780_attributes,
}; };
static int __devinit bh1780_probe(struct i2c_client *client, static int bh1780_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
int ret; int ret;
......
...@@ -36,7 +36,7 @@ static int bmp085_i2c_detect(struct i2c_client *client, ...@@ -36,7 +36,7 @@ static int bmp085_i2c_detect(struct i2c_client *client,
return bmp085_detect(&client->dev); return bmp085_detect(&client->dev);
} }
static int __devinit bmp085_i2c_probe(struct i2c_client *client, static int bmp085_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
int err; int err;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <linux/err.h> #include <linux/err.h>
#include "bmp085.h" #include "bmp085.h"
static int __devinit bmp085_spi_probe(struct spi_device *client) static int bmp085_spi_probe(struct spi_device *client)
{ {
int err; int err;
struct regmap *regmap; struct regmap *regmap;
......
...@@ -420,7 +420,7 @@ struct regmap_config bmp085_regmap_config = { ...@@ -420,7 +420,7 @@ struct regmap_config bmp085_regmap_config = {
}; };
EXPORT_SYMBOL_GPL(bmp085_regmap_config); EXPORT_SYMBOL_GPL(bmp085_regmap_config);
__devinit int bmp085_probe(struct device *dev, struct regmap *regmap) int bmp085_probe(struct device *dev, struct regmap *regmap)
{ {
struct bmp085_data *data; struct bmp085_data *data;
int err = 0; int err = 0;
......
...@@ -30,7 +30,7 @@ void cb710_pci_update_config_reg(struct pci_dev *pdev, ...@@ -30,7 +30,7 @@ void cb710_pci_update_config_reg(struct pci_dev *pdev,
EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg); EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg);
/* Some magic writes based on Windows driver init code */ /* Some magic writes based on Windows driver init code */
static int __devinit cb710_pci_configure(struct pci_dev *pdev) static int cb710_pci_configure(struct pci_dev *pdev)
{ {
unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0); unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
struct pci_dev *pdev0; struct pci_dev *pdev0;
...@@ -96,7 +96,7 @@ static void cb710_release_slot(struct device *dev) ...@@ -96,7 +96,7 @@ static void cb710_release_slot(struct device *dev)
#endif #endif
} }
static int __devinit cb710_register_slot(struct cb710_chip *chip, static int cb710_register_slot(struct cb710_chip *chip,
unsigned slot_mask, unsigned io_offset, const char *name) unsigned slot_mask, unsigned io_offset, const char *name)
{ {
int nr = chip->slots; int nr = chip->slots;
...@@ -201,7 +201,7 @@ static int cb710_resume(struct pci_dev *pdev) ...@@ -201,7 +201,7 @@ static int cb710_resume(struct pci_dev *pdev)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static int __devinit cb710_probe(struct pci_dev *pdev, static int cb710_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct cb710_chip *chip; struct cb710_chip *chip;
......
...@@ -246,7 +246,7 @@ EXPORT_SYMBOL_GPL(cs5535_mfgpt_write); ...@@ -246,7 +246,7 @@ EXPORT_SYMBOL_GPL(cs5535_mfgpt_write);
* Jordan tells me that he and Mitch once played w/ it, but it's unclear * Jordan tells me that he and Mitch once played w/ it, but it's unclear
* what the results of that were (and they experienced some instability). * what the results of that were (and they experienced some instability).
*/ */
static void __devinit reset_all_timers(void) static void reset_all_timers(void)
{ {
uint32_t val, dummy; uint32_t val, dummy;
...@@ -262,7 +262,7 @@ static void __devinit reset_all_timers(void) ...@@ -262,7 +262,7 @@ static void __devinit reset_all_timers(void)
* In other cases (such as with VSAless OpenFirmware), the system firmware * In other cases (such as with VSAless OpenFirmware), the system firmware
* leaves timers available for us to use. * leaves timers available for us to use.
*/ */
static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt) static int scan_timers(struct cs5535_mfgpt_chip *mfgpt)
{ {
struct cs5535_mfgpt_timer timer = { .chip = mfgpt }; struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
unsigned long flags; unsigned long flags;
...@@ -289,7 +289,7 @@ static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt) ...@@ -289,7 +289,7 @@ static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt)
return timers; return timers;
} }
static int __devinit cs5535_mfgpt_probe(struct platform_device *pdev) static int cs5535_mfgpt_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
int err = -EIO, t; int err = -EIO, t;
......
...@@ -309,7 +309,7 @@ static ssize_t eeprom_93xx46_store_erase(struct device *dev, ...@@ -309,7 +309,7 @@ static ssize_t eeprom_93xx46_store_erase(struct device *dev,
} }
static DEVICE_ATTR(erase, S_IWUSR, NULL, eeprom_93xx46_store_erase); static DEVICE_ATTR(erase, S_IWUSR, NULL, eeprom_93xx46_store_erase);
static int __devinit eeprom_93xx46_probe(struct spi_device *spi) static int eeprom_93xx46_probe(struct spi_device *spi)
{ {
struct eeprom_93xx46_platform_data *pd; struct eeprom_93xx46_platform_data *pd;
struct eeprom_93xx46_dev *edev; struct eeprom_93xx46_dev *edev;
......
...@@ -407,7 +407,7 @@ static int fsa9480_irq_init(struct fsa9480_usbsw *usbsw) ...@@ -407,7 +407,7 @@ static int fsa9480_irq_init(struct fsa9480_usbsw *usbsw)
return 0; return 0;
} }
static int __devinit fsa9480_probe(struct i2c_client *client, static int fsa9480_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
......
...@@ -686,7 +686,7 @@ static void ilo_unmap_device(struct pci_dev *pdev, struct ilo_hwinfo *hw) ...@@ -686,7 +686,7 @@ static void ilo_unmap_device(struct pci_dev *pdev, struct ilo_hwinfo *hw)
pci_iounmap(pdev, hw->mmio_vaddr); pci_iounmap(pdev, hw->mmio_vaddr);
} }
static int __devinit ilo_map_device(struct pci_dev *pdev, struct ilo_hwinfo *hw) static int ilo_map_device(struct pci_dev *pdev, struct ilo_hwinfo *hw)
{ {
int error = -ENOMEM; int error = -ENOMEM;
...@@ -751,7 +751,7 @@ static void ilo_remove(struct pci_dev *pdev) ...@@ -751,7 +751,7 @@ static void ilo_remove(struct pci_dev *pdev)
ilo_hwdev[(minor / max_ccb)] = 0; ilo_hwdev[(minor / max_ccb)] = 0;
} }
static int __devinit ilo_probe(struct pci_dev *pdev, static int ilo_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int devnum, minor, start, error = 0; int devnum, minor, start, error = 0;
......
...@@ -62,7 +62,7 @@ module_param(ibmasm_debug, int , S_IRUGO | S_IWUSR); ...@@ -62,7 +62,7 @@ module_param(ibmasm_debug, int , S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ibmasm_debug, " Set debug mode on or off"); MODULE_PARM_DESC(ibmasm_debug, " Set debug mode on or off");
static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
int result; int result;
struct service_processor *sp; struct service_processor *sp;
......
...@@ -139,7 +139,7 @@ ioc4_unregister_submodule(struct ioc4_submodule *is) ...@@ -139,7 +139,7 @@ ioc4_unregister_submodule(struct ioc4_submodule *is)
* even though the following code utilizes external interrupt registers * even though the following code utilizes external interrupt registers
* to perform the speed calculation. * to perform the speed calculation.
*/ */
static void __devinit static void
ioc4_clock_calibrate(struct ioc4_driver_data *idd) ioc4_clock_calibrate(struct ioc4_driver_data *idd)
{ {
union ioc4_int_out int_out; union ioc4_int_out int_out;
...@@ -231,7 +231,7 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd) ...@@ -231,7 +231,7 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
* on the same PCI bus at slot number 3 to differentiate IO9 from IO10. * on the same PCI bus at slot number 3 to differentiate IO9 from IO10.
* If neither is present, it's a PCI-RT. * If neither is present, it's a PCI-RT.
*/ */
static unsigned int __devinit static unsigned int
ioc4_variant(struct ioc4_driver_data *idd) ioc4_variant(struct ioc4_driver_data *idd)
{ {
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
...@@ -279,7 +279,7 @@ ioc4_load_modules(struct work_struct *work) ...@@ -279,7 +279,7 @@ ioc4_load_modules(struct work_struct *work)
static DECLARE_WORK(ioc4_load_modules_work, ioc4_load_modules); static DECLARE_WORK(ioc4_load_modules_work, ioc4_load_modules);
/* Adds a new instance of an IOC4 card */ /* Adds a new instance of an IOC4 card */
static int __devinit static int
ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
{ {
struct ioc4_driver_data *idd; struct ioc4_driver_data *idd;
......
...@@ -365,7 +365,7 @@ static int isl29003_init_client(struct i2c_client *client) ...@@ -365,7 +365,7 @@ static int isl29003_init_client(struct i2c_client *client)
* I2C layer * I2C layer
*/ */
static int __devinit isl29003_probe(struct i2c_client *client, static int isl29003_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
......
...@@ -114,7 +114,7 @@ static struct of_device_id lis3lv02d_i2c_dt_ids[] = { ...@@ -114,7 +114,7 @@ static struct of_device_id lis3lv02d_i2c_dt_ids[] = {
MODULE_DEVICE_TABLE(of, lis3lv02d_i2c_dt_ids); MODULE_DEVICE_TABLE(of, lis3lv02d_i2c_dt_ids);
#endif #endif
static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client, static int lis3lv02d_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
int ret = 0; int ret = 0;
......
...@@ -69,7 +69,7 @@ static struct of_device_id lis302dl_spi_dt_ids[] = { ...@@ -69,7 +69,7 @@ static struct of_device_id lis302dl_spi_dt_ids[] = {
MODULE_DEVICE_TABLE(of, lis302dl_spi_dt_ids); MODULE_DEVICE_TABLE(of, lis302dl_spi_dt_ids);
#endif #endif
static int __devinit lis302dl_spi_probe(struct spi_device *spi) static int lis302dl_spi_probe(struct spi_device *spi)
{ {
int ret; int ret;
......
...@@ -743,7 +743,7 @@ static struct miscdevice mei_misc_device = { ...@@ -743,7 +743,7 @@ static struct miscdevice mei_misc_device = {
* *
* returns true if ME Interface is valid, false otherwise * returns true if ME Interface is valid, false otherwise
*/ */
static bool __devinit mei_quirk_probe(struct pci_dev *pdev, static bool mei_quirk_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
u32 reg; u32 reg;
...@@ -765,7 +765,7 @@ static bool __devinit mei_quirk_probe(struct pci_dev *pdev, ...@@ -765,7 +765,7 @@ static bool __devinit mei_quirk_probe(struct pci_dev *pdev,
* *
* returns 0 on success, <0 on failure. * returns 0 on success, <0 on failure.
*/ */
static int __devinit mei_probe(struct pci_dev *pdev, static int mei_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct mei_device *dev; struct mei_device *dev;
......
...@@ -666,7 +666,7 @@ static struct bin_attribute pch_bin_attr = { ...@@ -666,7 +666,7 @@ static struct bin_attribute pch_bin_attr = {
.write = pch_phub_bin_write, .write = pch_phub_bin_write,
}; };
static int __devinit pch_phub_probe(struct pci_dev *pdev, static int pch_phub_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
int retval; int retval;
......
...@@ -324,7 +324,7 @@ static irqreturn_t phantom_isr(int irq, void *data) ...@@ -324,7 +324,7 @@ static irqreturn_t phantom_isr(int irq, void *data)
* Init and deinit driver * Init and deinit driver
*/ */
static unsigned int __devinit phantom_get_free(void) static unsigned int phantom_get_free(void)
{ {
unsigned int i; unsigned int i;
...@@ -335,7 +335,7 @@ static unsigned int __devinit phantom_get_free(void) ...@@ -335,7 +335,7 @@ static unsigned int __devinit phantom_get_free(void)
return i; return i;
} }
static int __devinit phantom_probe(struct pci_dev *pdev, static int phantom_probe(struct pci_dev *pdev,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
struct phantom_device *pht; struct phantom_device *pht;
......
...@@ -796,7 +796,7 @@ static const struct tty_port_operations tty_port_ops = { ...@@ -796,7 +796,7 @@ static const struct tty_port_operations tty_port_ops = {
* 0 for success * 0 for success
* otherwise, error * otherwise, error
*/ */
static int __devinit pti_pci_probe(struct pci_dev *pdev, static int pti_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
unsigned int a; unsigned int a;
......
...@@ -711,7 +711,7 @@ static void spear13xx_pcie_device_init(struct spear_pcie_gadget_config *config) ...@@ -711,7 +711,7 @@ static void spear13xx_pcie_device_init(struct spear_pcie_gadget_config *config)
spear_dbi_write_reg(config, PCI_INTERRUPT_LINE, 1, 1); spear_dbi_write_reg(config, PCI_INTERRUPT_LINE, 1, 1);
} }
static int __devinit spear_pcie_gadget_probe(struct platform_device *pdev) static int spear_pcie_gadget_probe(struct platform_device *pdev)
{ {
struct resource *res0, *res1; struct resource *res0, *res1;
unsigned int status = 0; unsigned int status = 0;
......
...@@ -54,7 +54,7 @@ static const struct attribute_group dac7512_attr_group = { ...@@ -54,7 +54,7 @@ static const struct attribute_group dac7512_attr_group = {
.attrs = dac7512_attributes, .attrs = dac7512_attributes,
}; };
static int __devinit dac7512_probe(struct spi_device *spi) static int dac7512_probe(struct spi_device *spi)
{ {
int ret; int ret;
......
...@@ -347,7 +347,7 @@ static int tsl2550_init_client(struct i2c_client *client) ...@@ -347,7 +347,7 @@ static int tsl2550_init_client(struct i2c_client *client)
*/ */
static struct i2c_driver tsl2550_driver; static struct i2c_driver tsl2550_driver;
static int __devinit tsl2550_probe(struct i2c_client *client, static int tsl2550_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment