Skip to content

Commit

Permalink
leds: 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: Richard Purdie <rpurdie@rpsys.net>
Cc: Jan-Simon Moeller <jansimon.moeller@gmx.de>
Acked-by: Bryan Wu <cooloney@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@wfp5p @gregkh
wfp5p authored and gregkh committed Nov 28, 2012
1 parent df07cf8 commit 98ea1ea
Show file tree
Hide file tree
Showing 33 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions drivers/leds/leds-adp5520.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static int adp5520_led_setup(struct adp5520_led *led)
return ret;
}

static int __devinit adp5520_led_prepare(struct platform_device *pdev)
static int adp5520_led_prepare(struct platform_device *pdev)
{
struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
struct device *dev = pdev->dev.parent;
Expand All @@ -101,7 +101,7 @@ static int __devinit adp5520_led_prepare(struct platform_device *pdev)
return ret;
}

static int __devinit adp5520_led_probe(struct platform_device *pdev)
static int adp5520_led_probe(struct platform_device *pdev)
{
struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
struct adp5520_led *led, *led_dat;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-asic3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static int blink_set(struct led_classdev *cdev,
return 0;
}

static int __devinit asic3_led_probe(struct platform_device *pdev)
static int asic3_led_probe(struct platform_device *pdev)
{
struct asic3_led *led = pdev->dev.platform_data;
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-atmel-pwm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static void pwmled_brightness(struct led_classdev *cdev, enum led_brightness b)
* NOTE: we reuse the platform_data structure of GPIO leds,
* but repurpose its "gpio" number as a PWM channel number.
*/
static int __devinit pwmled_probe(struct platform_device *pdev)
static int pwmled_probe(struct platform_device *pdev)
{
const struct gpio_led_platform_data *pdata;
struct pwmled *leds;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-bd2802.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ static void bd2802_unregister_led_classdev(struct bd2802_led *led)
led_classdev_unregister(&led->cdev_led1r);
}

static int __devinit bd2802_probe(struct i2c_client *client,
static int bd2802_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct bd2802_led *led;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-blinkm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ static int blinkm_detect(struct i2c_client *client, struct i2c_board_info *info)
return 0;
}

static int __devinit blinkm_probe(struct i2c_client *client,
static int blinkm_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct blinkm_data *data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-clevo-mail.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static struct led_classdev clevo_mail_led = {
.flags = LED_CORE_SUSPENDRESUME,
};

static int __devinit clevo_mail_led_probe(struct platform_device *pdev)
static int clevo_mail_led_probe(struct platform_device *pdev)
{
return led_classdev_register(&pdev->dev, &clevo_mail_led);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-cobalt-qube.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static struct led_classdev qube_front_led = {
.default_trigger = "default-on",
};

static int __devinit cobalt_qube_led_probe(struct platform_device *pdev)
static int cobalt_qube_led_probe(struct platform_device *pdev)
{
struct resource *res;
int retval;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-cobalt-raq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static struct led_classdev raq_power_off_led = {
.default_trigger = "power-off",
};

static int __devinit cobalt_raq_led_probe(struct platform_device *pdev)
static int cobalt_raq_led_probe(struct platform_device *pdev)
{
struct resource *res;
int retval;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-da903x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void da903x_led_set(struct led_classdev *led_cdev,
schedule_work(&led->work);
}

static int __devinit da903x_led_probe(struct platform_device *pdev)
static int da903x_led_probe(struct platform_device *pdev)
{
struct led_info *pdata = pdev->dev.platform_data;
struct da903x_led *led;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-da9052.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static int da9052_configure_leds(struct da9052 *da9052)
return error;
}

static int __devinit da9052_led_probe(struct platform_device *pdev)
static int da9052_led_probe(struct platform_device *pdev)
{
struct da9052_pdata *pdata;
struct da9052 *da9052;
Expand Down
8 changes: 4 additions & 4 deletions drivers/leds/leds-gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static int gpio_blink_set(struct led_classdev *led_cdev,
delay_on, delay_off);
}

static int __devinit create_gpio_led(const struct gpio_led *template,
static int create_gpio_led(const struct gpio_led *template,
struct gpio_led_data *led_dat, struct device *parent,
int (*blink_set)(unsigned, int, unsigned long *, unsigned long *))
{
Expand Down Expand Up @@ -167,7 +167,7 @@ static inline int sizeof_gpio_leds_priv(int num_leds)

/* Code to create from OpenFirmware platform devices */
#ifdef CONFIG_OF_GPIO
static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)
static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node, *child;
struct gpio_leds_priv *priv;
Expand Down Expand Up @@ -224,14 +224,14 @@ static const struct of_device_id of_gpio_leds_match[] = {
{},
};
#else /* CONFIG_OF_GPIO */
static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)
static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)
{
return NULL;
}
#endif /* CONFIG_OF_GPIO */


static int __devinit gpio_led_probe(struct platform_device *pdev)
static int gpio_led_probe(struct platform_device *pdev)
{
struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
struct gpio_leds_priv *priv;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-lm3530.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ static ssize_t lm3530_mode_set(struct device *dev, struct device_attribute
}
static DEVICE_ATTR(mode, 0644, lm3530_mode_get, lm3530_mode_set);

static int __devinit lm3530_probe(struct i2c_client *client,
static int lm3530_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lm3530_platform_data *pdata = client->dev.platform_data;
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lm3533.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ static struct attribute_group lm3533_led_attribute_group = {
.attrs = lm3533_led_attributes
};

static int __devinit lm3533_led_setup(struct lm3533_led *led,
static int lm3533_led_setup(struct lm3533_led *led,
struct lm3533_led_platform_data *pdata)
{
int ret;
Expand All @@ -658,7 +658,7 @@ static int __devinit lm3533_led_setup(struct lm3533_led *led,
return lm3533_ctrlbank_set_pwm(&led->cb, pdata->pwm);
}

static int __devinit lm3533_led_probe(struct platform_device *pdev)
static int lm3533_led_probe(struct platform_device *pdev)
{
struct lm3533 *lm3533;
struct lm3533_led_platform_data *pdata;
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lm355x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static char lm355x_name[][I2C_NAME_SIZE] = {
};

/* chip initialize */
static int __devinit lm355x_chip_init(struct lm355x_chip_data *chip)
static int lm355x_chip_init(struct lm355x_chip_data *chip)
{
int ret;
unsigned int reg_val;
Expand Down Expand Up @@ -420,7 +420,7 @@ static const struct regmap_config lm355x_regmap = {
};

/* module initialize */
static int __devinit lm355x_probe(struct i2c_client *client,
static int lm355x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lm355x_platform_data *pdata = client->dev.platform_data;
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lm3642.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ struct lm3642_chip_data {
};

/* chip initialize */
static int __devinit lm3642_chip_init(struct lm3642_chip_data *chip)
static int lm3642_chip_init(struct lm3642_chip_data *chip)
{
int ret;
struct lm3642_platform_data *pdata = chip->pdata;
Expand Down Expand Up @@ -313,7 +313,7 @@ static const struct regmap_config lm3642_regmap = {
.max_register = REG_MAX,
};

static int __devinit lm3642_probe(struct i2c_client *client,
static int lm3642_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lm3642_platform_data *pdata = client->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-lp3944.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ static int lp3944_configure(struct i2c_client *client,
return err;
}

static int __devinit lp3944_probe(struct i2c_client *client,
static int lp3944_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lp3944_platform_data *lp3944_pdata = client->dev.platform_data;
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lp5521.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ static void lp5521_unregister_sysfs(struct i2c_client *client)
&lp5521_led_attribute_group);
}

static int __devinit lp5521_init_led(struct lp5521_led *led,
static int lp5521_init_led(struct lp5521_led *led,
struct i2c_client *client,
int chan, struct lp5521_platform_data *pdata)
{
Expand Down Expand Up @@ -736,7 +736,7 @@ static int __devinit lp5521_init_led(struct lp5521_led *led,
return 0;
}

static int __devinit lp5521_probe(struct i2c_client *client,
static int lp5521_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lp5521_chip *chip;
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lp5523.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ static int __init lp5523_init_engine(struct lp5523_engine *engine, int id)
return 0;
}

static int __devinit lp5523_init_led(struct lp5523_led *led, struct device *dev,
static int lp5523_init_led(struct lp5523_led *led, struct device *dev,
int chan, struct lp5523_platform_data *pdata,
const char *chip_name)
{
Expand Down Expand Up @@ -882,7 +882,7 @@ static int __devinit lp5523_init_led(struct lp5523_led *led, struct device *dev,
return 0;
}

static int __devinit lp5523_probe(struct i2c_client *client,
static int lp5523_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lp5523_chip *chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-lp8788.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static void lp8788_brightness_set(struct led_classdev *led_cdev,
schedule_work(&led->work);
}

static __devinit int lp8788_led_probe(struct platform_device *pdev)
static int lp8788_led_probe(struct platform_device *pdev)
{
struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
struct lp8788_led_platform_data *led_pdata;
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lt3593.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static void lt3593_led_set(struct led_classdev *led_cdev,
schedule_work(&led_dat->work);
}

static int __devinit create_lt3593_led(const struct gpio_led *template,
static int create_lt3593_led(const struct gpio_led *template,
struct lt3593_led_data *led_dat, struct device *parent)
{
int ret, state;
Expand Down Expand Up @@ -140,7 +140,7 @@ static void delete_lt3593_led(struct lt3593_led_data *led)
gpio_free(led->gpio);
}

static int __devinit lt3593_led_probe(struct platform_device *pdev)
static int lt3593_led_probe(struct platform_device *pdev)
{
struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
struct lt3593_led_data *leds_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-max8997.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static ssize_t max8997_led_store_mode(struct device *dev,

static DEVICE_ATTR(mode, 0644, max8997_led_show_mode, max8997_led_store_mode);

static int __devinit max8997_led_probe(struct platform_device *pdev)
static int max8997_led_probe(struct platform_device *pdev)
{
struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max8997_platform_data *pdata = dev_get_platdata(iodev->dev);
Expand Down
6 changes: 3 additions & 3 deletions drivers/leds/leds-mc13783.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static void mc13783_led_set(struct led_classdev *led_cdev,
schedule_work(&led->work);
}

static int __devinit mc13783_led_setup(struct mc13783_led *led, int max_current)
static int mc13783_led_setup(struct mc13783_led *led, int max_current)
{
int shift = 0;
int mask = 0;
Expand Down Expand Up @@ -181,7 +181,7 @@ static int __devinit mc13783_led_setup(struct mc13783_led *led, int max_current)
return ret;
}

static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
static int mc13783_leds_prepare(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
Expand Down Expand Up @@ -262,7 +262,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
return ret;
}

static int __devinit mc13783_led_probe(struct platform_device *pdev)
static int mc13783_led_probe(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct mc13xxx_led_platform_data *led_cur;
Expand Down
6 changes: 3 additions & 3 deletions drivers/leds/leds-netxbig.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static void gpio_ext_set_value(struct netxbig_gpio_ext *gpio_ext,
spin_unlock_irqrestore(&gpio_ext_lock, flags);
}

static int __devinit gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)
static int gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)
{
int err;
int i;
Expand Down Expand Up @@ -301,7 +301,7 @@ static void delete_netxbig_led(struct netxbig_led_data *led_dat)
led_classdev_unregister(&led_dat->cdev);
}

static int __devinit
static int
create_netxbig_led(struct platform_device *pdev,
struct netxbig_led_data *led_dat,
const struct netxbig_led *template)
Expand Down Expand Up @@ -352,7 +352,7 @@ create_netxbig_led(struct platform_device *pdev,
return ret;
}

static int __devinit netxbig_led_probe(struct platform_device *pdev)
static int netxbig_led_probe(struct platform_device *pdev)
{
struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
struct netxbig_led_data *leds_data;
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-ns2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static ssize_t ns2_led_sata_show(struct device *dev,

static DEVICE_ATTR(sata, 0644, ns2_led_sata_show, ns2_led_sata_store);

static int __devinit
static int
create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
const struct ns2_led *template)
{
Expand Down Expand Up @@ -263,7 +263,7 @@ static void delete_ns2_led(struct ns2_led_data *led_dat)
gpio_free(led_dat->slow);
}

static int __devinit ns2_led_probe(struct platform_device *pdev)
static int ns2_led_probe(struct platform_device *pdev)
{
struct ns2_led_platform_data *pdata = pdev->dev.platform_data;
struct ns2_led_data *leds_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-ot200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static void ot200_led_brightness_set(struct led_classdev *led_cdev,
spin_unlock_irqrestore(&value_lock, flags);
}

static int __devinit ot200_led_probe(struct platform_device *pdev)
static int ot200_led_probe(struct platform_device *pdev)
{
int i;
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-pca955x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ static void pca955x_led_set(struct led_classdev *led_cdev, enum led_brightness v
schedule_work(&pca955x->work);
}

static int __devinit pca955x_probe(struct i2c_client *client,
static int pca955x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct pca955x *pca955x;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-pca9633.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static void pca9633_led_set(struct led_classdev *led_cdev,
schedule_work(&pca9633->work);
}

static int __devinit pca9633_probe(struct i2c_client *client,
static int pca9633_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct pca9633_led *pca9633;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-rb532.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static struct led_classdev rb532_uled = {
.default_trigger = "nand-disk",
};

static int __devinit rb532_led_probe(struct platform_device *pdev)
static int rb532_led_probe(struct platform_device *pdev)
{
return led_classdev_register(&pdev->dev, &rb532_uled);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static void regulator_led_brightness_set(struct led_classdev *led_cdev,
schedule_work(&led->work);
}

static int __devinit regulator_led_probe(struct platform_device *pdev)
static int regulator_led_probe(struct platform_device *pdev)
{
struct led_regulator_platform_data *pdata = pdev->dev.platform_data;
struct regulator_led *led;
Expand Down
Loading

0 comments on commit 98ea1ea

Please sign in to comment.