Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f791be49 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

mfd: 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: 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: default avatarDavid Brown <davidb@codeaurora.org>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 84449216

drivers/mfd/88pm800.c

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ 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;
@@ -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 @@ 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;

drivers/mfd/88pm805.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ 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;

drivers/mfd/88pm80x.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/mfd/88pm860x-core.c

+15 −15
Original line number Diff line number Diff line
@@ -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 @@ 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);
@@ -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 @@ 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)

{
@@ -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;

drivers/mfd/ab3100-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;