Skip to content

Commit

Permalink
staging: vme: 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: Martyn Welch <martyn.welch@ge.com>
Cc: Manohar Vanga <manohar.vanga@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 59cb218 commit d7e530d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/vme/devices/vme_pio2.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ struct pio2_card {
int pio2_cntr_reset(struct pio2_card *);

int pio2_gpio_reset(struct pio2_card *);
int __devinit pio2_gpio_init(struct pio2_card *);
int pio2_gpio_init(struct pio2_card *);
void pio2_gpio_exit(struct pio2_card *);

#endif /* _VME_PIO2_H_ */
4 changes: 2 additions & 2 deletions drivers/staging/vme/devices/vme_pio2_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static int variant_num;
static bool loopback;

static int pio2_match(struct vme_dev *);
static int __devinit pio2_probe(struct vme_dev *);
static int pio2_probe(struct vme_dev *);
static int __devexit pio2_remove(struct vme_dev *);

static int pio2_get_led(struct pio2_card *card)
Expand Down Expand Up @@ -222,7 +222,7 @@ static int pio2_match(struct vme_dev *vdev)
return 1;
}

static int __devinit pio2_probe(struct vme_dev *vdev)
static int pio2_probe(struct vme_dev *vdev)
{
struct pio2_card *card;
int retval;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vme/devices/vme_pio2_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ int pio2_gpio_reset(struct pio2_card *card)
return 0;
}

int __devinit pio2_gpio_init(struct pio2_card *card)
int pio2_gpio_init(struct pio2_card *card)
{
int retval = 0;
char *label;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/vme/devices/vme_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static loff_t vme_user_llseek(struct file *, loff_t, int);
static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);

static int vme_user_match(struct vme_dev *);
static int __devinit vme_user_probe(struct vme_dev *);
static int vme_user_probe(struct vme_dev *);
static int __devexit vme_user_remove(struct vme_dev *);

static const struct file_operations vme_user_fops = {
Expand Down Expand Up @@ -673,7 +673,7 @@ static int vme_user_match(struct vme_dev *vdev)
* as practical. We will therefore reserve the buffers and request the images
* here so that we don't have to do it later.
*/
static int __devinit vme_user_probe(struct vme_dev *vdev)
static int vme_user_probe(struct vme_dev *vdev)
{
int i, err;
char name[12];
Expand Down

0 comments on commit d7e530d

Please sign in to comment.