Commit 4ae1c61f authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

staging: iio: 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: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a6a8a84
......@@ -175,7 +175,7 @@ static const struct adis_data adis16201_data = {
BIT(ADIS16201_DIAG_STAT_POWER_LOW_BIT),
};
static int __devinit adis16201_probe(struct spi_device *spi)
static int adis16201_probe(struct spi_device *spi)
{
int ret;
struct adis *st;
......
......@@ -141,7 +141,7 @@ static const struct adis_data adis16203_data = {
BIT(ADIS16203_DIAG_STAT_POWER_LOW_BIT),
};
static int __devinit adis16203_probe(struct spi_device *spi)
static int adis16203_probe(struct spi_device *spi)
{
int ret;
struct iio_dev *indio_dev;
......
......@@ -182,7 +182,7 @@ static const struct adis_data adis16204_data = {
BIT(ADIS16204_DIAG_STAT_POWER_LOW_BIT),
};
static int __devinit adis16204_probe(struct spi_device *spi)
static int adis16204_probe(struct spi_device *spi)
{
int ret;
struct adis *st;
......
......@@ -176,7 +176,7 @@ static const struct adis_data adis16209_data = {
};
static int __devinit adis16209_probe(struct spi_device *spi)
static int adis16209_probe(struct spi_device *spi)
{
int ret;
struct adis *st;
......
......@@ -421,7 +421,7 @@ static const struct adis_data adis16220_data = {
BIT(ADIS16220_DIAG_STAT_POWER_LOW_BIT),
};
static int __devinit adis16220_probe(struct spi_device *spi)
static int adis16220_probe(struct spi_device *spi)
{
int ret;
struct adis16220_state *st;
......
......@@ -232,7 +232,7 @@ static const struct adis_data adis16240_data = {
BIT(ADIS16240_DIAG_STAT_POWER_LOW_BIT),
};
static int __devinit adis16240_probe(struct spi_device *spi)
static int adis16240_probe(struct spi_device *spi)
{
int ret;
struct adis *st;
......
......@@ -200,7 +200,7 @@ static const struct attribute_group kxsd9_attribute_group = {
.attrs = kxsd9_attributes,
};
static int __devinit kxsd9_power_up(struct kxsd9_state *st)
static int kxsd9_power_up(struct kxsd9_state *st)
{
int ret;
......@@ -222,7 +222,7 @@ static const struct iio_info kxsd9_info = {
.driver_module = THIS_MODULE,
};
static int __devinit kxsd9_probe(struct spi_device *spi)
static int kxsd9_probe(struct spi_device *spi)
{
struct iio_dev *indio_dev;
struct kxsd9_state *st;
......
......@@ -675,7 +675,7 @@ static const struct iio_info lis3l02dq_info = {
.attrs = &lis3l02dq_attribute_group,
};
static int __devinit lis3l02dq_probe(struct spi_device *spi)
static int lis3l02dq_probe(struct spi_device *spi)
{
int ret;
struct lis3l02dq_state *st;
......
......@@ -1139,7 +1139,7 @@ static const struct iio_info sca3000_info_with_temp = {
.driver_module = THIS_MODULE,
};
static int __devinit sca3000_probe(struct spi_device *spi)
static int sca3000_probe(struct spi_device *spi)
{
int ret;
struct sca3000_state *st;
......
......@@ -606,7 +606,7 @@ static const struct iio_chan_spec ad7192_channels[] = {
IIO_CHAN_SOFT_TIMESTAMP(8),
};
static int __devinit ad7192_probe(struct spi_device *spi)
static int ad7192_probe(struct spi_device *spi)
{
const struct ad7192_platform_data *pdata = spi->dev.platform_data;
struct ad7192_state *st;
......
......@@ -832,7 +832,7 @@ static const struct ad7280_platform_data ad7793_default_pdata = {
.thermistor_term_en = true,
};
static int __devinit ad7280_probe(struct spi_device *spi)
static int ad7280_probe(struct spi_device *spi)
{
const struct ad7280_platform_data *pdata = spi->dev.platform_data;
struct ad7280_state *st;
......
......@@ -580,7 +580,7 @@ static const struct iio_info ad7291_info = {
.event_attrs = &ad7291_event_attribute_group,
};
static int __devinit ad7291_probe(struct i2c_client *client,
static int ad7291_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ad7291_chip_info *chip;
......
......@@ -47,7 +47,7 @@ static const struct ad7606_bus_ops ad7606_par8_bops = {
.read_block = ad7606_par8_read_block,
};
static int __devinit ad7606_par_probe(struct platform_device *pdev)
static int ad7606_par_probe(struct platform_device *pdev)
{
struct resource *res;
struct iio_dev *indio_dev;
......
......@@ -39,7 +39,7 @@ static const struct ad7606_bus_ops ad7606_spi_bops = {
.read_block = ad7606_spi_read_block,
};
static int __devinit ad7606_spi_probe(struct spi_device *spi)
static int ad7606_spi_probe(struct spi_device *spi)
{
struct iio_dev *indio_dev;
......
......@@ -164,7 +164,7 @@ static const struct iio_info ad7780_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad7780_probe(struct spi_device *spi)
static int ad7780_probe(struct spi_device *spi)
{
struct ad7780_platform_data *pdata = spi->dev.platform_data;
struct ad7780_state *st;
......
......@@ -441,7 +441,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
},
};
static int __devinit ad7793_probe(struct spi_device *spi)
static int ad7793_probe(struct spi_device *spi)
{
const struct ad7793_platform_data *pdata = spi->dev.platform_data;
struct ad7793_state *st;
......
......@@ -341,7 +341,7 @@ static const struct iio_info ad7816_info = {
* device probe and remove
*/
static int __devinit ad7816_probe(struct spi_device *spi_dev)
static int ad7816_probe(struct spi_device *spi_dev)
{
struct ad7816_chip_info *chip;
struct iio_dev *indio_dev;
......
......@@ -854,7 +854,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
},
};
static int __devinit ad799x_probe(struct i2c_client *client,
static int ad799x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret;
......
......@@ -695,7 +695,7 @@ static const struct iio_info adt7410_info = {
* device probe and remove
*/
static int __devinit adt7410_probe(struct device *dev, int irq,
static int adt7410_probe(struct device *dev, int irq,
const char *name, const struct adt7410_ops *ops)
{
unsigned long *adt7410_platform_data = dev->platform_data;
......@@ -876,7 +876,7 @@ static const struct adt7410_ops adt7410_i2c_ops = {
.write_byte = adt7410_i2c_write_byte,
};
static int __devinit adt7410_i2c_probe(struct i2c_client *client,
static int adt7410_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
return adt7410_probe(&client->dev, client->irq, id->name,
......@@ -1030,7 +1030,7 @@ static const struct adt7410_ops adt7310_spi_ops = {
.write_byte = adt7310_spi_write_byte,
};
static int __devinit adt7310_spi_probe(struct spi_device *spi)
static int adt7310_spi_probe(struct spi_device *spi)
{
return adt7410_probe(&spi->dev, spi->irq,
spi_get_device_id(spi)->name, &adt7310_spi_ops);
......
......@@ -126,7 +126,7 @@ static irqreturn_t lpc32xx_adc_isr(int irq, void *dev_id)
return IRQ_HANDLED;
}
static int __devinit lpc32xx_adc_probe(struct platform_device *pdev)
static int lpc32xx_adc_probe(struct platform_device *pdev)
{
struct lpc32xx_adc_info *info = NULL;
struct resource *res;
......
......@@ -466,7 +466,7 @@ static void mxs_lradc_hw_stop(struct mxs_lradc *lradc)
writel(0, lradc->base + LRADC_DELAY(i));
}
static int __devinit mxs_lradc_probe(struct platform_device *pdev)
static int mxs_lradc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct mxs_lradc *lradc;
......
......@@ -291,7 +291,7 @@ static const struct iio_info spear_adc_iio_info = {
.driver_module = THIS_MODULE,
};
static int __devinit spear_adc_probe(struct platform_device *pdev)
static int spear_adc_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct device *dev = &pdev->dev;
......
......@@ -92,7 +92,7 @@ static int adt7316_i2c_multi_write(void *client, u8 reg, u8 count, u8 *data)
* device probe and remove
*/
static int __devinit adt7316_i2c_probe(struct i2c_client *client,
static int adt7316_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct adt7316_bus bus = {
......
......@@ -89,7 +89,7 @@ static int adt7316_spi_write(void *client, u8 reg, u8 val)
* device probe and remove
*/
static int __devinit adt7316_spi_probe(struct spi_device *spi_dev)
static int adt7316_spi_probe(struct spi_device *spi_dev)
{
struct adt7316_bus bus = {
.client = spi_dev,
......
......@@ -2125,7 +2125,7 @@ static const struct iio_info adt7516_info = {
/*
* device probe and remove
*/
int __devinit adt7316_probe(struct device *dev, struct adt7316_bus *bus,
int adt7316_probe(struct device *dev, struct adt7316_bus *bus,
const char *name)
{
struct adt7316_chip_info *chip;
......
......@@ -551,7 +551,7 @@ static const struct iio_info ad7150_info = {
* device probe and remove
*/
static int __devinit ad7150_probe(struct i2c_client *client,
static int ad7150_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret;
......
......@@ -474,7 +474,7 @@ static const struct iio_chan_spec ad7152_channels[] = {
* device probe and remove
*/
static int __devinit ad7152_probe(struct i2c_client *client,
static int ad7152_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret = 0;
......
......@@ -694,7 +694,7 @@ static const struct iio_info ad7746_info = {
* device probe and remove
*/
static int __devinit ad7746_probe(struct i2c_client *client,
static int ad7746_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ad7746_platform_data *pdata = client->dev.platform_data;
......
......@@ -91,7 +91,7 @@ static const struct iio_info ad5930_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad5930_probe(struct spi_device *spi)
static int ad5930_probe(struct spi_device *spi)
{
struct ad5930_state *st;
struct iio_dev *idev;
......
......@@ -201,7 +201,7 @@ static const struct iio_info ad9832_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad9832_probe(struct spi_device *spi)
static int ad9832_probe(struct spi_device *spi)
{
struct ad9832_platform_data *pdata = spi->dev.platform_data;
struct iio_dev *indio_dev;
......
......@@ -314,7 +314,7 @@ static const struct iio_info ad9833_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad9834_probe(struct spi_device *spi)
static int ad9834_probe(struct spi_device *spi)
{
struct ad9834_platform_data *pdata = spi->dev.platform_data;
struct ad9834_state *st;
......
......@@ -77,7 +77,7 @@ static const struct iio_info ad9850_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad9850_probe(struct spi_device *spi)
static int ad9850_probe(struct spi_device *spi)
{
struct ad9850_state *st;
struct iio_dev *idev;
......
......@@ -226,7 +226,7 @@ static const struct iio_info ad9852_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad9852_probe(struct spi_device *spi)
static int ad9852_probe(struct spi_device *spi)
{
struct ad9852_state *st;
struct iio_dev *idev;
......
......@@ -361,7 +361,7 @@ static const struct iio_info ad9910_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad9910_probe(struct spi_device *spi)
static int ad9910_probe(struct spi_device *spi)
{
struct ad9910_state *st;
struct iio_dev *idev;
......
......@@ -170,7 +170,7 @@ static const struct iio_info ad9951_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad9951_probe(struct spi_device *spi)
static int ad9951_probe(struct spi_device *spi)
{
struct ad9951_state *st;
struct iio_dev *idev;
......
......@@ -145,7 +145,7 @@ static const struct iio_chan_spec adis16060_channels[] = {
}
};
static int __devinit adis16060_r_probe(struct spi_device *spi)
static int adis16060_r_probe(struct spi_device *spi)
{
int ret;
struct adis16060_state *st;
......@@ -192,7 +192,7 @@ static int __devexit adis16060_r_remove(struct spi_device *spi)
return 0;
}
static int __devinit adis16060_w_probe(struct spi_device *spi)
static int adis16060_w_probe(struct spi_device *spi)
{
int ret;
struct iio_dev *indio_dev = adis16060_iio_dev;
......
......@@ -138,7 +138,7 @@ static const struct iio_info adis16080_info = {
.driver_module = THIS_MODULE,
};
static int __devinit adis16080_probe(struct spi_device *spi)
static int adis16080_probe(struct spi_device *spi)
{
int ret;
struct adis16080_state *st;
......
......@@ -116,7 +116,7 @@ static const struct iio_info adis16130_info = {
.driver_module = THIS_MODULE,
};
static int __devinit adis16130_probe(struct spi_device *spi)
static int adis16130_probe(struct spi_device *spi)
{
int ret;
struct adis16130_state *st;
......
......@@ -301,7 +301,7 @@ static const struct adis_data adis16260_data = {
BIT(ADIS16260_DIAG_STAT_POWER_LOW_BIT),
};
static int __devinit adis16260_probe(struct spi_device *spi)
static int adis16260_probe(struct spi_device *spi)
{
int ret;
struct adis16260_platform_data *pd = spi->dev.platform_data;
......
......@@ -365,7 +365,7 @@ static const struct iio_info adxrs450_info = {
.write_raw = &adxrs450_write_raw,
};
static int __devinit adxrs450_probe(struct spi_device *spi)
static int adxrs450_probe(struct spi_device *spi)
{
int ret;
struct adxrs450_state *st;
......
......@@ -69,7 +69,7 @@ static void iio_hwmon_free_attrs(struct iio_hwmon_state *st)
}
}
static int __devinit iio_hwmon_probe(struct platform_device *pdev)
static int iio_hwmon_probe(struct platform_device *pdev)
{
struct iio_hwmon_state *st;
struct sensor_device_attribute *a;
......
......@@ -378,7 +378,7 @@ static int iio_dummy_init_device(struct iio_dev *indio_dev)
* const struct i2c_device_id *id)
* SPI: iio_dummy_probe(struct spi_device *spi)
*/
static int __devinit iio_dummy_probe(int index)
static int iio_dummy_probe(int index)
{
int ret;
struct iio_dev *indio_dev;
......
......@@ -697,7 +697,7 @@ static void ad5933_work(struct work_struct *work)
mutex_unlock(&indio_dev->mlock);
}
static int __devinit ad5933_probe(struct i2c_client *client,
static int ad5933_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret, voltage_uv = 0;
......
......@@ -1206,7 +1206,7 @@ static const struct iio_info adis16400_info = {
.attrs = &adis16400_attribute_group,
};
static int __devinit adis16400_probe(struct spi_device *spi)
static int adis16400_probe(struct spi_device *spi)
{
int ret;
struct adis16400_state *st;
......
......@@ -543,7 +543,7 @@ static const struct regmap_config isl29018_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit isl29018_probe(struct i2c_client *client,
static int isl29018_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct isl29018_chip *chip;
......
......@@ -475,7 +475,7 @@ static const struct regmap_config isl29028_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit isl29028_probe(struct i2c_client *client,
static int isl29028_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct isl29028_chip *chip;
......
......@@ -705,7 +705,7 @@ static const struct iio_info tsl2563_info = {
.write_event_config = &tsl2563_write_interrupt_config,
};
static int __devinit tsl2563_probe(struct i2c_client *client,
static int tsl2563_probe(struct i2c_client *client,
const struct i2c_device_id *device_id)
{
struct iio_dev *indio_dev;
......
......@@ -799,7 +799,7 @@ static const struct iio_info tsl2583_info = {
* Client probe function - When a valid device is found, the driver's device
* data structure is updated, and initialization completes successfully.
*/
static int __devinit taos_probe(struct i2c_client *clientp,
static int taos_probe(struct i2c_client *clientp,
const struct i2c_device_id *idp)
{
int i, ret;
......
......@@ -1897,7 +1897,7 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
},
};
static int __devinit tsl2x7x_probe(struct i2c_client *clientp,
static int tsl2x7x_probe(struct i2c_client *clientp,
const struct i2c_device_id *id)
{
int ret;
......
......@@ -409,7 +409,7 @@ static const struct iio_info ak8975_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ak8975_probe(struct i2c_client *client,
static int ak8975_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ak8975_data *data;
......
......@@ -665,7 +665,7 @@ static const struct iio_info hmc5843_info = {
.driver_module = THIS_MODULE,
};
static int __devinit hmc5843_probe(struct i2c_client *client,
static int hmc5843_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct hmc5843_data *data;
......
......@@ -512,7 +512,7 @@ static const struct iio_info ade7753_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ade7753_probe(struct spi_device *spi)
static int ade7753_probe(struct spi_device *spi)
{
int ret;
struct ade7753_state *st;
......
......@@ -535,7 +535,7 @@ static const struct iio_info ade7754_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ade7754_probe(struct spi_device *spi)
static int ade7754_probe(struct spi_device *spi)
{
int ret;
struct ade7754_state *st;
......
......@@ -881,7 +881,7 @@ static const struct iio_info ade7758_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ade7758_probe(struct spi_device *spi)
static int ade7758_probe(struct spi_device *spi)
{
int ret;
struct ade7758_state *st;
......
......@@ -458,7 +458,7 @@ static const struct iio_info ade7759_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ade7759_probe(struct spi_device *spi)
static int ade7759_probe(struct spi_device *spi)
{
int ret;
struct ade7759_state *st;
......
......@@ -201,7 +201,7 @@ static int ade7854_i2c_read_reg_32(struct device *dev,
return ret;
}
static int __devinit ade7854_i2c_probe(struct i2c_client *client,
static int ade7854_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret;
......
......@@ -300,7 +300,7 @@ static int ade7854_spi_read_reg_32(struct device *dev,
return ret;
}
static int __devinit ade7854_spi_probe(struct spi_device *spi)
static int ade7854_spi_probe(struct spi_device *spi)
{
int ret;
struct ade7854_state *st;
......
......@@ -99,7 +99,7 @@ static const struct iio_info ad2s1200_info = {
.driver_module = THIS_MODULE,
};
static int __devinit ad2s1200_probe(struct spi_device *spi)
static int ad2s1200_probe(struct spi_device *spi)
{
struct ad2s1200_state *st;
struct iio_dev *indio_dev;
......
......@@ -610,7 +610,7 @@ static const struct attribute_group ad2s1210_attribute_group = {
.attrs = ad2s1210_attributes,
};
static int __devinit ad2s1210_initial(struct ad2s1210_state *st)
static int ad2s1210_initial(struct ad2s1210_state *st)
{
unsigned char data;
int ret;
......@@ -681,7 +681,7 @@ static void ad2s1210_free_gpios(struct ad2s1210_state *st)
gpio_free_array(ad2s1210_gpios, ARRAY_SIZE(ad2s1210_gpios));
}
static int __devinit ad2s1210_probe(struct spi_device *spi)
static int ad2s1210_probe(struct spi_device *spi)
{
struct iio_dev *indio_dev;
struct ad2s1210_state *st;
......
......@@ -58,7 +58,7 @@ static const struct iio_chan_spec ad2s90_chan = {
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
};
static int __devinit ad2s90_probe(struct spi_device *spi)
static int ad2s90_probe(struct spi_device *spi)
{
struct iio_dev *indio_dev;
struct ad2s90_state *st;
......
......@@ -180,7 +180,7 @@ static const struct iio_trigger_ops iio_bfin_tmr_trigger_ops = {
.set_trigger_state = iio_bfin_tmr_set_state,
};
static int __devinit iio_bfin_tmr_trigger_probe(struct platform_device *pdev)
static int iio_bfin_tmr_trigger_probe(struct platform_device *pdev)
{
struct iio_bfin_timer_trigger_pdata *pdata = pdev->dev.platform_data;
struct bfin_tmr_state *st;
......
......@@ -51,7 +51,7 @@ static const struct iio_trigger_ops iio_gpio_trigger_ops = {
.owner = THIS_MODULE,
};
static int __devinit iio_gpio_trigger_probe(struct platform_device *pdev)
static int iio_gpio_trigger_probe(struct platform_device *pdev)
{
struct iio_gpio_trigger_info *trig_info;
struct iio_trigger *trig, *trig2;
......
......@@ -101,7 +101,7 @@ static const struct iio_trigger_ops iio_prtc_trigger_ops = {
.set_trigger_state = &iio_trig_periodic_rtc_set_state,
};
static int __devinit iio_trig_periodic_rtc_probe(struct platform_device *dev)
static int iio_trig_periodic_rtc_probe(struct platform_device *dev)
{
char **pdata = dev->dev.platform_data;
struct iio_prtc_trigger_info *trig_info;
......
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