diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 18:22:52 -0500 |
commit | 9671f09921d93e722a28ae9610d478e092ac5466 (patch) | |
tree | 3d2c5c8014d703b89061fd02e5362bf81a48a1f9 /drivers/tty/hvc | |
parent | 2d47b7160243b1422006b91debf438484a4fde58 (diff) |
tty: 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: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Lucas Tavares <lucaskt@linux.vnet.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Tony Prisk <linux@prisktech.co.nz>
Acked-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/hvc')
-rw-r--r-- | drivers/tty/hvc/hvc_opal.c | 2 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_vio.c | 2 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 2 | ||||
-rw-r--r-- | drivers/tty/hvc/hvcs.c | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c index 442bfb0d41da..79f2b5e17f8d 100644 --- a/drivers/tty/hvc/hvc_opal.c +++ b/drivers/tty/hvc/hvc_opal.c | |||
@@ -161,7 +161,7 @@ static const struct hv_ops hvc_opal_hvsi_ops = { | |||
161 | .tiocmset = hvc_opal_hvsi_tiocmset, | 161 | .tiocmset = hvc_opal_hvsi_tiocmset, |
162 | }; | 162 | }; |
163 | 163 | ||
164 | static int __devinit hvc_opal_probe(struct platform_device *dev) | 164 | static int hvc_opal_probe(struct platform_device *dev) |
165 | { | 165 | { |
166 | const struct hv_ops *ops; | 166 | const struct hv_ops *ops; |
167 | struct hvc_struct *hp; | 167 | struct hvc_struct *hp; |
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index 070c0ee68642..77bde6c2cfa0 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c | |||
@@ -293,7 +293,7 @@ static int udbg_hvc_getc(void) | |||
293 | } | 293 | } |
294 | } | 294 | } |
295 | 295 | ||
296 | static int __devinit hvc_vio_probe(struct vio_dev *vdev, | 296 | static int hvc_vio_probe(struct vio_dev *vdev, |
297 | const struct vio_device_id *id) | 297 | const struct vio_device_id *id) |
298 | { | 298 | { |
299 | const struct hv_ops *ops; | 299 | const struct hv_ops *ops; |
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index f4abfe238f98..19843ec3f80a 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c | |||
@@ -422,7 +422,7 @@ static int xencons_connect_backend(struct xenbus_device *dev, | |||
422 | return ret; | 422 | return ret; |
423 | } | 423 | } |
424 | 424 | ||
425 | static int __devinit xencons_probe(struct xenbus_device *dev, | 425 | static int xencons_probe(struct xenbus_device *dev, |
426 | const struct xenbus_device_id *id) | 426 | const struct xenbus_device_id *id) |
427 | { | 427 | { |
428 | int ret, devid; | 428 | int ret, devid; |
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c index 888af583fe75..506a28e5564f 100644 --- a/drivers/tty/hvc/hvcs.c +++ b/drivers/tty/hvc/hvcs.c | |||
@@ -330,12 +330,12 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp); | |||
330 | static void hvcs_close(struct tty_struct *tty, struct file *filp); | 330 | static void hvcs_close(struct tty_struct *tty, struct file *filp); |
331 | static void hvcs_hangup(struct tty_struct * tty); | 331 | static void hvcs_hangup(struct tty_struct * tty); |
332 | 332 | ||
333 | static int __devinit hvcs_probe(struct vio_dev *dev, | 333 | static int hvcs_probe(struct vio_dev *dev, |
334 | const struct vio_device_id *id); | 334 | const struct vio_device_id *id); |
335 | static int __devexit hvcs_remove(struct vio_dev *dev); | 335 | static int __devexit hvcs_remove(struct vio_dev *dev); |
336 | static int __init hvcs_module_init(void); | 336 | static int __init hvcs_module_init(void); |
337 | static void __exit hvcs_module_exit(void); | 337 | static void __exit hvcs_module_exit(void); |
338 | static int __devinit hvcs_initialize(void); | 338 | static int hvcs_initialize(void); |
339 | 339 | ||
340 | #define HVCS_SCHED_READ 0x00000001 | 340 | #define HVCS_SCHED_READ 0x00000001 |
341 | #define HVCS_QUICK_READ 0x00000002 | 341 | #define HVCS_QUICK_READ 0x00000002 |
@@ -756,7 +756,7 @@ static int hvcs_get_index(void) | |||
756 | return -1; | 756 | return -1; |
757 | } | 757 | } |
758 | 758 | ||
759 | static int __devinit hvcs_probe( | 759 | static int hvcs_probe( |
760 | struct vio_dev *dev, | 760 | struct vio_dev *dev, |
761 | const struct vio_device_id *id) | 761 | const struct vio_device_id *id) |
762 | { | 762 | { |
@@ -1478,7 +1478,7 @@ static void hvcs_free_index_list(void) | |||
1478 | hvcs_index_count = 0; | 1478 | hvcs_index_count = 0; |
1479 | } | 1479 | } |
1480 | 1480 | ||
1481 | static int __devinit hvcs_initialize(void) | 1481 | static int hvcs_initialize(void) |
1482 | { | 1482 | { |
1483 | int rc, num_ttys_to_alloc; | 1483 | int rc, num_ttys_to_alloc; |
1484 | 1484 | ||