mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
mfd: 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: 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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
84449216b0
commit
f791be492f
@@ -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;
|
||||
@@ -315,7 +315,7 @@ out:
|
||||
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;
|
||||
@@ -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;
|
||||
@@ -499,7 +499,7 @@ out:
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -232,7 +232,7 @@ out_irq_init:
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+15
-15
@@ -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 \
|
||||
@@ -730,7 +730,7 @@ out:
|
||||
}
|
||||
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);
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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)
|
||||
{
|
||||
@@ -1040,7 +1040,7 @@ out:
|
||||
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)
|
||||
{
|
||||
@@ -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;
|
||||
@@ -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)
|
||||
{
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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" };
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -491,7 +491,7 @@ failed:
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user