Skip to content

Commit

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

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent 8444921 commit f791be4
Show file tree
Hide file tree
Showing 69 changed files with 138 additions and 138 deletions.
8 changes: 4 additions & 4 deletions drivers/mfd/88pm800.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static const struct regmap_irq pm800_irqs[] = {
},
};

static int __devinit device_gpadc_init(struct pm80x_chip *chip,
static int device_gpadc_init(struct pm80x_chip *chip,
struct pm80x_platform_data *pdata)
{
struct pm80x_subchip *subchip = chip->subchip;
Expand Down Expand Up @@ -315,7 +315,7 @@ static int __devinit device_gpadc_init(struct pm80x_chip *chip,
return ret;
}

static int __devinit device_irq_init_800(struct pm80x_chip *chip)
static int device_irq_init_800(struct pm80x_chip *chip)
{
struct regmap *map = chip->regmap;
unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
Expand Down Expand Up @@ -415,7 +415,7 @@ static void pm800_pages_exit(struct pm80x_chip *chip)
}
}

static int __devinit device_800_init(struct pm80x_chip *chip,
static int device_800_init(struct pm80x_chip *chip,
struct pm80x_platform_data *pdata)
{
int ret, pmic_id;
Expand Down Expand Up @@ -499,7 +499,7 @@ static int __devinit device_800_init(struct pm80x_chip *chip,
return ret;
}

static int __devinit pm800_probe(struct i2c_client *client,
static int pm800_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret = 0;
Expand Down
6 changes: 3 additions & 3 deletions drivers/mfd/88pm805.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static struct regmap_irq pm805_irqs[] = {
},
};

static int __devinit device_irq_init_805(struct pm80x_chip *chip)
static int device_irq_init_805(struct pm80x_chip *chip)
{
struct regmap *map = chip->regmap;
unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
Expand Down Expand Up @@ -189,7 +189,7 @@ static struct regmap_irq_chip pm805_irq_chip = {
.ack_base = PM805_INT_STATUS1,
};

static int __devinit device_805_init(struct pm80x_chip *chip)
static int device_805_init(struct pm80x_chip *chip)
{
int ret = 0;
unsigned int val;
Expand Down Expand Up @@ -232,7 +232,7 @@ static int __devinit device_805_init(struct pm80x_chip *chip)
return ret;
}

static int __devinit pm805_probe(struct i2c_client *client,
static int pm805_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/88pm80x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const struct regmap_config pm80x_regmap_config = {
};
EXPORT_SYMBOL_GPL(pm80x_regmap_config);

int __devinit pm80x_init(struct i2c_client *client,
int pm80x_init(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct pm80x_chip *chip;
Expand Down
30 changes: 15 additions & 15 deletions drivers/mfd/88pm860x-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ static struct irq_domain_ops pm860x_irq_domain_ops = {
.xlate = irq_domain_xlate_onetwocell,
};

static int __devinit device_irq_init(struct pm860x_chip *chip,
static int device_irq_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \
Expand Down Expand Up @@ -730,7 +730,7 @@ int pm8606_osc_disable(struct pm860x_chip *chip, unsigned short client)
}
EXPORT_SYMBOL(pm8606_osc_disable);

static void __devinit device_osc_init(struct i2c_client *i2c)
static void device_osc_init(struct i2c_client *i2c)
{
struct pm860x_chip *chip = i2c_get_clientdata(i2c);

Expand All @@ -745,7 +745,7 @@ static void __devinit device_osc_init(struct i2c_client *i2c)
chip->osc_status = PM8606_REF_GP_OSC_OFF;
}

static void __devinit device_bk_init(struct pm860x_chip *chip,
static void device_bk_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret, i;
Expand All @@ -765,7 +765,7 @@ static void __devinit device_bk_init(struct pm860x_chip *chip,
dev_err(chip->dev, "Failed to add backlight subdev\n");
}

static void __devinit device_led_init(struct pm860x_chip *chip,
static void device_led_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret, i;
Expand All @@ -787,7 +787,7 @@ static void __devinit device_led_init(struct pm860x_chip *chip,
}
}

static void __devinit device_regulator_init(struct pm860x_chip *chip,
static void device_regulator_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret;
Expand Down Expand Up @@ -866,7 +866,7 @@ static void __devinit device_regulator_init(struct pm860x_chip *chip,
}
}

static void __devinit device_rtc_init(struct pm860x_chip *chip,
static void device_rtc_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret;
Expand All @@ -885,7 +885,7 @@ static void __devinit device_rtc_init(struct pm860x_chip *chip,
dev_err(chip->dev, "Failed to add rtc subdev\n");
}

static void __devinit device_touch_init(struct pm860x_chip *chip,
static void device_touch_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret;
Expand All @@ -904,7 +904,7 @@ static void __devinit device_touch_init(struct pm860x_chip *chip,
dev_err(chip->dev, "Failed to add touch subdev\n");
}

static void __devinit device_power_init(struct pm860x_chip *chip,
static void device_power_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret;
Expand Down Expand Up @@ -951,7 +951,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip,
}
}

static void __devinit device_onkey_init(struct pm860x_chip *chip,
static void device_onkey_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret;
Expand All @@ -965,7 +965,7 @@ static void __devinit device_onkey_init(struct pm860x_chip *chip,
dev_err(chip->dev, "Failed to add onkey subdev\n");
}

static void __devinit device_codec_init(struct pm860x_chip *chip,
static void device_codec_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
int ret;
Expand All @@ -979,7 +979,7 @@ static void __devinit device_codec_init(struct pm860x_chip *chip,
dev_err(chip->dev, "Failed to add codec subdev\n");
}

static void __devinit device_8607_init(struct pm860x_chip *chip,
static void device_8607_init(struct pm860x_chip *chip,
struct i2c_client *i2c,
struct pm860x_platform_data *pdata)
{
Expand Down Expand Up @@ -1040,7 +1040,7 @@ static void __devinit device_8607_init(struct pm860x_chip *chip,
return;
}

static void __devinit device_8606_init(struct pm860x_chip *chip,
static void device_8606_init(struct pm860x_chip *chip,
struct i2c_client *i2c,
struct pm860x_platform_data *pdata)
{
Expand All @@ -1049,7 +1049,7 @@ static void __devinit device_8606_init(struct pm860x_chip *chip,
device_led_init(chip, pdata);
}

static int __devinit pm860x_device_init(struct pm860x_chip *chip,
static int pm860x_device_init(struct pm860x_chip *chip,
struct pm860x_platform_data *pdata)
{
chip->core_irq = 0;
Expand Down Expand Up @@ -1109,7 +1109,7 @@ static struct regmap_config pm860x_regmap_config = {
.val_bits = 8,
};

static int __devinit pm860x_dt_init(struct device_node *np,
static int pm860x_dt_init(struct device_node *np,
struct device *dev,
struct pm860x_platform_data *pdata)
{
Expand All @@ -1127,7 +1127,7 @@ static int __devinit pm860x_dt_init(struct device_node *np,
return 0;
}

static int __devinit pm860x_probe(struct i2c_client *client,
static int pm860x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct pm860x_platform_data *pdata = client->dev.platform_data;
Expand Down
4 changes: 2 additions & 2 deletions drivers/mfd/ab3100-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ ab3100_init_settings[] = {
},
};

static int __devinit ab3100_setup(struct ab3100 *ab3100)
static int ab3100_setup(struct ab3100 *ab3100)
{
int err = 0;
int i;
Expand Down Expand Up @@ -857,7 +857,7 @@ static const struct ab_family_id ids[] __devinitconst = {
},
};

static int __devinit ab3100_probe(struct i2c_client *client,
static int ab3100_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ab3100 *ab3100;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/ab8500-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ static struct attribute_group ab9540_attr_group = {
.attrs = ab9540_sysfs_entries,
};

static int __devinit ab8500_probe(struct platform_device *pdev)
static int ab8500_probe(struct platform_device *pdev)
{
static char *switch_off_status[] = {
"Swoff bit programming",
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/ab8500-debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ static struct dentry *ab8500_bank_file;
static struct dentry *ab8500_address_file;
static struct dentry *ab8500_val_file;

static int __devinit ab8500_debug_probe(struct platform_device *plf)
static int ab8500_debug_probe(struct platform_device *plf)
{
debug_bank = AB8500_MISC;
debug_address = AB8500_REV_REG & 0x00FF;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/ab8500-gpadc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ static void ab8500_gpadc_read_calibration_data(struct ab8500_gpadc *gpadc)
gpadc->cal_data[ADC_INPUT_VBAT].offset);
}

static int __devinit ab8500_gpadc_probe(struct platform_device *pdev)
static int ab8500_gpadc_probe(struct platform_device *pdev)
{
int ret = 0;
struct ab8500_gpadc *gpadc;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/ab8500-sysctrl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value)
(u8)(reg & 0xFF), mask, value);
}

static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev)
static int ab8500_sysctrl_probe(struct platform_device *pdev)
{
sysctrl_dev = &pdev->dev;
return 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/adp5520.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static int adp5520_remove_subdevs(struct adp5520_chip *chip)
return device_for_each_child(chip->dev, NULL, __remove_subdev);
}

static int __devinit adp5520_probe(struct i2c_client *client,
static int adp5520_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct adp5520_platform_data *pdata = client->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/arizona-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ static struct mfd_cell wm5110_devs[] = {
{ .name = "wm5110-codec" },
};

int __devinit arizona_dev_init(struct arizona *arizona)
int arizona_dev_init(struct arizona *arizona)
{
struct device *dev = arizona->dev;
const char *type_name;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/arizona-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "arizona.h"

static __devinit int arizona_i2c_probe(struct i2c_client *i2c,
static int arizona_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct arizona *arizona;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/arizona-spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "arizona.h"

static int __devinit arizona_spi_probe(struct spi_device *spi)
static int arizona_spi_probe(struct spi_device *spi)
{
const struct spi_device_id *id = spi_get_device_id(spi);
struct arizona *arizona;
Expand Down
4 changes: 2 additions & 2 deletions drivers/mfd/cs5535-mfd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static __devinitdata struct mfd_cell cs5535_mfd_cells[] = {
};

#ifdef CONFIG_OLPC
static void __devinit cs5535_clone_olpc_cells(void)
static void cs5535_clone_olpc_cells(void)
{
const char *acpi_clones[] = { "olpc-xo1-pm-acpi", "olpc-xo1-sci-acpi" };

Expand All @@ -126,7 +126,7 @@ static void __devinit cs5535_clone_olpc_cells(void)
static void cs5535_clone_olpc_cells(void) { }
#endif

static int __devinit cs5535_mfd_probe(struct pci_dev *pdev,
static int cs5535_mfd_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
int err, i;
Expand Down
6 changes: 3 additions & 3 deletions drivers/mfd/da903x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ int da903x_query_status(struct device *dev, unsigned int sbits)
}
EXPORT_SYMBOL(da903x_query_status);

static int __devinit da9030_init_chip(struct da903x_chip *chip)
static int da9030_init_chip(struct da903x_chip *chip)
{
uint8_t chip_id;
int err;
Expand Down Expand Up @@ -459,7 +459,7 @@ static int da903x_remove_subdevs(struct da903x_chip *chip)
return device_for_each_child(chip->dev, NULL, __remove_subdev);
}

static int __devinit da903x_add_subdevs(struct da903x_chip *chip,
static int da903x_add_subdevs(struct da903x_chip *chip,
struct da903x_platform_data *pdata)
{
struct da903x_subdev_info *subdev;
Expand Down Expand Up @@ -491,7 +491,7 @@ static int __devinit da903x_add_subdevs(struct da903x_chip *chip,
return ret;
}

static int __devinit da903x_probe(struct i2c_client *client,
static int da903x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct da903x_platform_data *pdata = client->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/da9052-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ struct regmap_config da9052_regmap_config = {
};
EXPORT_SYMBOL_GPL(da9052_regmap_config);

int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)
int da9052_device_init(struct da9052 *da9052, u8 chip_id)
{
struct da9052_pdata *pdata = da9052->dev->platform_data;
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/da9052-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static const struct of_device_id dialog_dt_ids[] = {
};
#endif

static int __devinit da9052_i2c_probe(struct i2c_client *client,
static int da9052_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct da9052 *da9052;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/da9052-spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <linux/mfd/da9052/da9052.h>

static int __devinit da9052_spi_probe(struct spi_device *spi)
static int da9052_spi_probe(struct spi_device *spi)
{
int ret;
const struct spi_device_id *id = spi_get_device_id(spi);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/da9055-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ static struct regmap_irq_chip da9055_regmap_irq_chip = {
.num_irqs = ARRAY_SIZE(da9055_irqs),
};

int __devinit da9055_device_init(struct da9055 *da9055)
int da9055_device_init(struct da9055 *da9055)
{
struct da9055_pdata *pdata = da9055->dev->platform_data;
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/da9055-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <linux/mfd/da9055/core.h>

static int __devinit da9055_i2c_probe(struct i2c_client *i2c,
static int da9055_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct da9055 *da9055;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/db8500-prcmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3034,7 +3034,7 @@ static struct mfd_cell db8500_prcmu_devs[] = {
* prcmu_fw_init - arch init call for the Linux PRCMU fw init logic
*
*/
static int __devinit db8500_prcmu_probe(struct platform_device *pdev)
static int db8500_prcmu_probe(struct platform_device *pdev)
{
struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data;
struct device_node *np = pdev->dev.of_node;
Expand Down
Loading

0 comments on commit f791be4

Please sign in to comment.