aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:26:18 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 18:27:46 -0500
commitae8d8a146725a966bd7c59c94f4d0016dcf7a04f (patch)
tree66dc363f206eb7a200615ba186462439099e997f
parent512f82a064e397e437845c3f03a3c6dc3e610e8b (diff)
tty: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit 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> Acked-by: Tobias Klauser <tklauser@distanz.ch> Cc: Lucas Tavares <lucaskt@linux.vnet.ibm.com> Cc: Daniel Walker <dwalker@fifo99.com> Cc: Bryan Huntsman <bryanh@codeaurora.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Peter Korsgaard <jacmet@sunsite.dk> Cc: Tony Prisk <linux@prisktech.co.nz> Acked-by: David Brown <davidb@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/cyclades.c2
-rw-r--r--drivers/tty/hvc/hvc_opal.c2
-rw-r--r--drivers/tty/hvc/hvc_vio.c2
-rw-r--r--drivers/tty/hvc/hvcs.c4
-rw-r--r--drivers/tty/isicom.c4
-rw-r--r--drivers/tty/moxa.c2
-rw-r--r--drivers/tty/mxser.c2
-rw-r--r--drivers/tty/nozomi.c4
-rw-r--r--drivers/tty/serial/8250/8250.c2
-rw-r--r--drivers/tty/serial/8250/8250_acorn.c2
-rw-r--r--drivers/tty/serial/8250/8250_dw.c2
-rw-r--r--drivers/tty/serial/8250/8250_em.c2
-rw-r--r--drivers/tty/serial/8250/8250_hp300.c4
-rw-r--r--drivers/tty/serial/8250/8250_pci.c12
-rw-r--r--drivers/tty/serial/8250/8250_pnp.c2
-rw-r--r--drivers/tty/serial/altera_jtaguart.c2
-rw-r--r--drivers/tty/serial/altera_uart.c2
-rw-r--r--drivers/tty/serial/ar933x_uart.c2
-rw-r--r--drivers/tty/serial/arc_uart.c2
-rw-r--r--drivers/tty/serial/atmel_serial.c2
-rw-r--r--drivers/tty/serial/bcm63xx_uart.c2
-rw-r--r--drivers/tty/serial/bfin_sport_uart.c2
-rw-r--r--drivers/tty/serial/bfin_uart.c2
-rw-r--r--drivers/tty/serial/clps711x.c2
-rw-r--r--drivers/tty/serial/cpm_uart/cpm_uart_core.c2
-rw-r--r--drivers/tty/serial/efm32-uart.c2
-rw-r--r--drivers/tty/serial/icom.c2
-rw-r--r--drivers/tty/serial/jsm/jsm_driver.c2
-rw-r--r--drivers/tty/serial/lpc32xx_hs.c2
-rw-r--r--drivers/tty/serial/max3100.c2
-rw-r--r--drivers/tty/serial/max310x.c2
-rw-r--r--drivers/tty/serial/mcf.c2
-rw-r--r--drivers/tty/serial/mrst_max3110.c2
-rw-r--r--drivers/tty/serial/msm_serial.c2
-rw-r--r--drivers/tty/serial/msm_serial_hs.c2
-rw-r--r--drivers/tty/serial/mux.c2
-rw-r--r--drivers/tty/serial/mxs-auart.c2
-rw-r--r--drivers/tty/serial/omap-serial.c2
-rw-r--r--drivers/tty/serial/samsung.c2
-rw-r--r--drivers/tty/serial/sccnxp.c2
-rw-r--r--drivers/tty/serial/serial_txx9.c6
-rw-r--r--drivers/tty/serial/sunhv.c2
-rw-r--r--drivers/tty/serial/sunsab.c2
-rw-r--r--drivers/tty/serial/sunsu.c2
-rw-r--r--drivers/tty/serial/sunzilog.c4
-rw-r--r--drivers/tty/serial/timbuart.c2
-rw-r--r--drivers/tty/serial/uartlite.c4
-rw-r--r--drivers/tty/serial/vr41xx_siu.c2
-rw-r--r--drivers/tty/serial/vt8500_serial.c2
-rw-r--r--drivers/tty/serial/xilinx_uartps.c2
-rw-r--r--drivers/tty/synclink.c2
-rw-r--r--drivers/tty/synclink_gt.c2
-rw-r--r--drivers/tty/synclinkmp.c2
53 files changed, 66 insertions, 66 deletions
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 2dff87cdce23..b09c8d1f9a66 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -3931,7 +3931,7 @@ err:
3931 return retval; 3931 return retval;
3932} 3932}
3933 3933
3934static void __devexit cy_pci_remove(struct pci_dev *pdev) 3934static void cy_pci_remove(struct pci_dev *pdev)
3935{ 3935{
3936 struct cyclades_card *cinfo = pci_get_drvdata(pdev); 3936 struct cyclades_card *cinfo = pci_get_drvdata(pdev);
3937 unsigned int i, channel; 3937 unsigned int i, channel;
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 61da5cd093fc..be1a9a1e749e 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -222,7 +222,7 @@ static int hvc_opal_probe(struct platform_device *dev)
222 return 0; 222 return 0;
223} 223}
224 224
225static int __devexit hvc_opal_remove(struct platform_device *dev) 225static int hvc_opal_remove(struct platform_device *dev)
226{ 226{
227 struct hvc_struct *hp = dev_get_drvdata(&dev->dev); 227 struct hvc_struct *hp = dev_get_drvdata(&dev->dev);
228 int rc, termno; 228 int rc, termno;
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 282d143a6437..ed6f5f1f5a55 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -362,7 +362,7 @@ static int hvc_vio_probe(struct vio_dev *vdev,
362 return 0; 362 return 0;
363} 363}
364 364
365static int __devexit hvc_vio_remove(struct vio_dev *vdev) 365static int hvc_vio_remove(struct vio_dev *vdev)
366{ 366{
367 struct hvc_struct *hp = dev_get_drvdata(&vdev->dev); 367 struct hvc_struct *hp = dev_get_drvdata(&vdev->dev);
368 int rc, termno; 368 int rc, termno;
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 5afe3b6041cf..877635733952 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -332,7 +332,7 @@ static void hvcs_hangup(struct tty_struct * tty);
332 332
333static int hvcs_probe(struct vio_dev *dev, 333static int hvcs_probe(struct vio_dev *dev,
334 const struct vio_device_id *id); 334 const struct vio_device_id *id);
335static int __devexit hvcs_remove(struct vio_dev *dev); 335static int hvcs_remove(struct vio_dev *dev);
336static int __init hvcs_module_init(void); 336static int __init hvcs_module_init(void);
337static void __exit hvcs_module_exit(void); 337static void __exit hvcs_module_exit(void);
338static int hvcs_initialize(void); 338static int hvcs_initialize(void);
@@ -835,7 +835,7 @@ static int hvcs_probe(
835 return 0; 835 return 0;
836} 836}
837 837
838static int __devexit hvcs_remove(struct vio_dev *dev) 838static int hvcs_remove(struct vio_dev *dev)
839{ 839{
840 struct hvcs_struct *hvcsd = dev_get_drvdata(&dev->dev); 840 struct hvcs_struct *hvcsd = dev_get_drvdata(&dev->dev);
841 unsigned long flags; 841 unsigned long flags;
diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 82661889b322..3205b2e9090b 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -148,7 +148,7 @@
148#endif 148#endif
149 149
150static int isicom_probe(struct pci_dev *, const struct pci_device_id *); 150static int isicom_probe(struct pci_dev *, const struct pci_device_id *);
151static void __devexit isicom_remove(struct pci_dev *); 151static void isicom_remove(struct pci_dev *);
152 152
153static struct pci_device_id isicom_pci_tbl[] = { 153static struct pci_device_id isicom_pci_tbl[] = {
154 { PCI_DEVICE(VENDOR_ID, 0x2028) }, 154 { PCI_DEVICE(VENDOR_ID, 0x2028) },
@@ -1635,7 +1635,7 @@ err:
1635 return retval; 1635 return retval;
1636} 1636}
1637 1637
1638static void __devexit isicom_remove(struct pci_dev *pdev) 1638static void isicom_remove(struct pci_dev *pdev)
1639{ 1639{
1640 struct isi_board *board = pci_get_drvdata(pdev); 1640 struct isi_board *board = pci_get_drvdata(pdev);
1641 unsigned int i; 1641 unsigned int i;
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 60ea74e76d3a..f9d28503bdec 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1020,7 +1020,7 @@ err:
1020 return retval; 1020 return retval;
1021} 1021}
1022 1022
1023static void __devexit moxa_pci_remove(struct pci_dev *pdev) 1023static void moxa_pci_remove(struct pci_dev *pdev)
1024{ 1024{
1025 struct moxa_board_conf *brd = pci_get_drvdata(pdev); 1025 struct moxa_board_conf *brd = pci_get_drvdata(pdev);
1026 1026
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 7f5e0ccf96ea..40113868bec2 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -2658,7 +2658,7 @@ err:
2658#endif 2658#endif
2659} 2659}
2660 2660
2661static void __devexit mxser_remove(struct pci_dev *pdev) 2661static void mxser_remove(struct pci_dev *pdev)
2662{ 2662{
2663#ifdef CONFIG_PCI 2663#ifdef CONFIG_PCI
2664 struct mxser_board *brd = pci_get_drvdata(pdev); 2664 struct mxser_board *brd = pci_get_drvdata(pdev);
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 2445aa4d2fa4..a0c69ab04399 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1507,7 +1507,7 @@ err:
1507 return ret; 1507 return ret;
1508} 1508}
1509 1509
1510static void __devexit tty_exit(struct nozomi *dc) 1510static void tty_exit(struct nozomi *dc)
1511{ 1511{
1512 unsigned int i; 1512 unsigned int i;
1513 1513
@@ -1530,7 +1530,7 @@ static void __devexit tty_exit(struct nozomi *dc)
1530} 1530}
1531 1531
1532/* Deallocate memory for one device */ 1532/* Deallocate memory for one device */
1533static void __devexit nozomi_card_exit(struct pci_dev *pdev) 1533static void nozomi_card_exit(struct pci_dev *pdev)
1534{ 1534{
1535 int i; 1535 int i;
1536 struct ctrl_ul ctrl; 1536 struct ctrl_ul ctrl;
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 40ba8cc0985d..2af83a246499 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -3035,7 +3035,7 @@ static int serial8250_probe(struct platform_device *dev)
3035/* 3035/*
3036 * Remove serial ports registered against a platform device. 3036 * Remove serial ports registered against a platform device.
3037 */ 3037 */
3038static int __devexit serial8250_remove(struct platform_device *dev) 3038static int serial8250_remove(struct platform_device *dev)
3039{ 3039{
3040 int i; 3040 int i;
3041 3041
diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index ed095eb2e3f2..549aa07c0d27 100644
--- a/drivers/tty/serial/8250/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
@@ -80,7 +80,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
80 return 0; 80 return 0;
81} 81}
82 82
83static void __devexit serial_card_remove(struct expansion_card *ec) 83static void serial_card_remove(struct expansion_card *ec)
84{ 84{
85 struct serial_card_info *info = ecard_get_drvdata(ec); 85 struct serial_card_info *info = ecard_get_drvdata(ec);
86 int i; 86 int i;
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 7664750c2bd6..1d0dba2d562d 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -152,7 +152,7 @@ static int dw8250_probe(struct platform_device *pdev)
152 return 0; 152 return 0;
153} 153}
154 154
155static int __devexit dw8250_remove(struct platform_device *pdev) 155static int dw8250_remove(struct platform_device *pdev)
156{ 156{
157 struct dw8250_data *data = platform_get_drvdata(pdev); 157 struct dw8250_data *data = platform_get_drvdata(pdev);
158 158
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index 430bf42374c0..916cc19fbbda 100644
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -152,7 +152,7 @@ static int serial8250_em_probe(struct platform_device *pdev)
152 return ret; 152 return ret;
153} 153}
154 154
155static int __devexit serial8250_em_remove(struct platform_device *pdev) 155static int serial8250_em_remove(struct platform_device *pdev)
156{ 156{
157 struct serial8250_em_priv *priv = platform_get_drvdata(pdev); 157 struct serial8250_em_priv *priv = platform_get_drvdata(pdev);
158 158
diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index 2b945052ee08..5bdaf271d395 100644
--- a/drivers/tty/serial/8250/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
@@ -38,7 +38,7 @@ static struct hp300_port *hp300_ports;
38 38
39static int hpdca_init_one(struct dio_dev *d, 39static int hpdca_init_one(struct dio_dev *d,
40 const struct dio_device_id *ent); 40 const struct dio_device_id *ent);
41static void __devexit hpdca_remove_one(struct dio_dev *d); 41static void hpdca_remove_one(struct dio_dev *d);
42 42
43static struct dio_device_id hpdca_dio_tbl[] = { 43static struct dio_device_id hpdca_dio_tbl[] = {
44 { DIO_ID_DCA0 }, 44 { DIO_ID_DCA0 },
@@ -288,7 +288,7 @@ static int __init hp300_8250_init(void)
288} 288}
289 289
290#ifdef CONFIG_HPDCA 290#ifdef CONFIG_HPDCA
291static void __devexit hpdca_remove_one(struct dio_dev *d) 291static void hpdca_remove_one(struct dio_dev *d)
292{ 292{
293 int line; 293 int line;
294 294
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 3252c5d47ff8..97058c1d7d45 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -288,7 +288,7 @@ static int pci_plx9050_init(struct pci_dev *dev)
288 return 0; 288 return 0;
289} 289}
290 290
291static void __devexit pci_plx9050_exit(struct pci_dev *dev) 291static void pci_plx9050_exit(struct pci_dev *dev)
292{ 292{
293 u8 __iomem *p; 293 u8 __iomem *p;
294 294
@@ -313,7 +313,7 @@ static void __devexit pci_plx9050_exit(struct pci_dev *dev)
313#define NI8420_INT_ENABLE_REG 0x38 313#define NI8420_INT_ENABLE_REG 0x38
314#define NI8420_INT_ENABLE_BIT 0x2000 314#define NI8420_INT_ENABLE_BIT 0x2000
315 315
316static void __devexit pci_ni8420_exit(struct pci_dev *dev) 316static void pci_ni8420_exit(struct pci_dev *dev)
317{ 317{
318 void __iomem *p; 318 void __iomem *p;
319 unsigned long base, len; 319 unsigned long base, len;
@@ -345,7 +345,7 @@ static void __devexit pci_ni8420_exit(struct pci_dev *dev)
345 345
346#define MITE_LCIMR2_CLR_CPU_IE (1 << 30) 346#define MITE_LCIMR2_CLR_CPU_IE (1 << 30)
347 347
348static void __devexit pci_ni8430_exit(struct pci_dev *dev) 348static void pci_ni8430_exit(struct pci_dev *dev)
349{ 349{
350 void __iomem *p; 350 void __iomem *p;
351 unsigned long base, len; 351 unsigned long base, len;
@@ -422,7 +422,7 @@ static int sbs_init(struct pci_dev *dev)
422 * Disables the global interrupt of PMC-OctalPro 422 * Disables the global interrupt of PMC-OctalPro
423 */ 423 */
424 424
425static void __devexit sbs_exit(struct pci_dev *dev) 425static void sbs_exit(struct pci_dev *dev)
426{ 426{
427 u8 __iomem *p; 427 u8 __iomem *p;
428 428
@@ -991,7 +991,7 @@ static int pci_ite887x_init(struct pci_dev *dev)
991 return ret; 991 return ret;
992} 992}
993 993
994static void __devexit pci_ite887x_exit(struct pci_dev *dev) 994static void pci_ite887x_exit(struct pci_dev *dev)
995{ 995{
996 u32 ioport; 996 u32 ioport;
997 /* the ioport is bit 0-15 in POSIO0R */ 997 /* the ioport is bit 0-15 in POSIO0R */
@@ -2988,7 +2988,7 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
2988 return rc; 2988 return rc;
2989} 2989}
2990 2990
2991static void __devexit pciserial_remove_one(struct pci_dev *dev) 2991static void pciserial_remove_one(struct pci_dev *dev)
2992{ 2992{
2993 struct serial_private *priv = pci_get_drvdata(dev); 2993 struct serial_private *priv = pci_get_drvdata(dev);
2994 2994
diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index 71daae90fb5e..35d9ab95c5cb 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -476,7 +476,7 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
476 return 0; 476 return 0;
477} 477}
478 478
479static void __devexit serial_pnp_remove(struct pnp_dev *dev) 479static void serial_pnp_remove(struct pnp_dev *dev)
480{ 480{
481 long line = (long)pnp_get_drvdata(dev); 481 long line = (long)pnp_get_drvdata(dev);
482 if (line) 482 if (line)
diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index ef5c705fa2b3..872f14ae43d2 100644
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -453,7 +453,7 @@ static int altera_jtaguart_probe(struct platform_device *pdev)
453 return 0; 453 return 0;
454} 454}
455 455
456static int __devexit altera_jtaguart_remove(struct platform_device *pdev) 456static int altera_jtaguart_remove(struct platform_device *pdev)
457{ 457{
458 struct uart_port *port; 458 struct uart_port *port;
459 int i = pdev->id; 459 int i = pdev->id;
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 066b5035e10a..684a0808e1c7 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -598,7 +598,7 @@ static int altera_uart_probe(struct platform_device *pdev)
598 return 0; 598 return 0;
599} 599}
600 600
601static int __devexit altera_uart_remove(struct platform_device *pdev) 601static int altera_uart_remove(struct platform_device *pdev)
602{ 602{
603 struct uart_port *port = platform_get_drvdata(pdev); 603 struct uart_port *port = platform_get_drvdata(pdev);
604 604
diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
index ad171508b9a9..505c490c0b44 100644
--- a/drivers/tty/serial/ar933x_uart.c
+++ b/drivers/tty/serial/ar933x_uart.c
@@ -707,7 +707,7 @@ err_free_up:
707 return ret; 707 return ret;
708} 708}
709 709
710static int __devexit ar933x_uart_remove(struct platform_device *pdev) 710static int ar933x_uart_remove(struct platform_device *pdev)
711{ 711{
712 struct ar933x_uart_port *up; 712 struct ar933x_uart_port *up;
713 713
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index 158d798a5203..3e0b3fac6a0e 100644
--- a/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@ -689,7 +689,7 @@ static int arc_serial_probe(struct platform_device *pdev)
689 return uart_add_one_port(&arc_uart_driver, &uart->port); 689 return uart_add_one_port(&arc_uart_driver, &uart->port);
690} 690}
691 691
692static int __devexit arc_serial_remove(struct platform_device *pdev) 692static int arc_serial_remove(struct platform_device *pdev)
693{ 693{
694 /* This will never be called */ 694 /* This will never be called */
695 return 0; 695 return 0;
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 02540cbf16a6..d2a98da26133 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1851,7 +1851,7 @@ err:
1851 return ret; 1851 return ret;
1852} 1852}
1853 1853
1854static int __devexit atmel_serial_remove(struct platform_device *pdev) 1854static int atmel_serial_remove(struct platform_device *pdev)
1855{ 1855{
1856 struct uart_port *port = platform_get_drvdata(pdev); 1856 struct uart_port *port = platform_get_drvdata(pdev);
1857 struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); 1857 struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index e54d1703be1e..c76a226080f2 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -848,7 +848,7 @@ static int bcm_uart_probe(struct platform_device *pdev)
848 return 0; 848 return 0;
849} 849}
850 850
851static int __devexit bcm_uart_remove(struct platform_device *pdev) 851static int bcm_uart_remove(struct platform_device *pdev)
852{ 852{
853 struct uart_port *port; 853 struct uart_port *port;
854 854
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index a47e00b056e7..f5d117379b60 100644
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -850,7 +850,7 @@ out_error_free_mem:
850 return ret; 850 return ret;
851} 851}
852 852
853static int __devexit sport_uart_remove(struct platform_device *pdev) 853static int sport_uart_remove(struct platform_device *pdev)
854{ 854{
855 struct sport_uart_port *sport = platform_get_drvdata(pdev); 855 struct sport_uart_port *sport = platform_get_drvdata(pdev);
856 856
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index f1f8210a6130..18cf45a29d40 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -1389,7 +1389,7 @@ out_error_free_mem:
1389 return ret; 1389 return ret;
1390} 1390}
1391 1391
1392static int __devexit bfin_serial_remove(struct platform_device *pdev) 1392static int bfin_serial_remove(struct platform_device *pdev)
1393{ 1393{
1394 struct bfin_serial_port *uart = platform_get_drvdata(pdev); 1394 struct bfin_serial_port *uart = platform_get_drvdata(pdev);
1395 1395
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index 006d283bbded..3fd2526d121e 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -491,7 +491,7 @@ err_out:
491 return ret; 491 return ret;
492} 492}
493 493
494static int __devexit uart_clps711x_remove(struct platform_device *pdev) 494static int uart_clps711x_remove(struct platform_device *pdev)
495{ 495{
496 struct clps711x_port *s = platform_get_drvdata(pdev); 496 struct clps711x_port *s = platform_get_drvdata(pdev);
497 int i; 497 int i;
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index de3f0f6eba74..ad0caf176808 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -1396,7 +1396,7 @@ static int cpm_uart_probe(struct platform_device *ofdev)
1396 return uart_add_one_port(&cpm_reg, &pinfo->port); 1396 return uart_add_one_port(&cpm_reg, &pinfo->port);
1397} 1397}
1398 1398
1399static int __devexit cpm_uart_remove(struct platform_device *ofdev) 1399static int cpm_uart_remove(struct platform_device *ofdev)
1400{ 1400{
1401 struct uart_cpm_port *pinfo = dev_get_drvdata(&ofdev->dev); 1401 struct uart_cpm_port *pinfo = dev_get_drvdata(&ofdev->dev);
1402 return uart_remove_one_port(&cpm_reg, &pinfo->port); 1402 return uart_remove_one_port(&cpm_reg, &pinfo->port);
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index 833c33a2751a..a8cbb2670521 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -764,7 +764,7 @@ err_get_base:
764 return ret; 764 return ret;
765} 765}
766 766
767static int __devexit efm32_uart_remove(struct platform_device *pdev) 767static int efm32_uart_remove(struct platform_device *pdev)
768{ 768{
769 struct efm32_uart_port *efm_port = platform_get_drvdata(pdev); 769 struct efm32_uart_port *efm_port = platform_get_drvdata(pdev);
770 770
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index a8267956ac88..6197a69adb4d 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1596,7 +1596,7 @@ probe_exit0:
1596 return retval; 1596 return retval;
1597} 1597}
1598 1598
1599static void __devexit icom_remove(struct pci_dev *dev) 1599static void icom_remove(struct pci_dev *dev)
1600{ 1600{
1601 struct icom_adapter *icom_adapter; 1601 struct icom_adapter *icom_adapter;
1602 struct list_head *tmp; 1602 struct list_head *tmp;
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 5b57c8eecfc9..a47d882d6743 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -178,7 +178,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
178 return rc; 178 return rc;
179} 179}
180 180
181static void __devexit jsm_remove_one(struct pci_dev *pdev) 181static void jsm_remove_one(struct pci_dev *pdev)
182{ 182{
183 struct jsm_board *brd = pci_get_drvdata(pdev); 183 struct jsm_board *brd = pci_get_drvdata(pdev);
184 int i = 0; 184 int i = 0;
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index 3651dab2009f..0e86bff3fe2a 100644
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -740,7 +740,7 @@ static int serial_hs_lpc32xx_probe(struct platform_device *pdev)
740/* 740/*
741 * Remove serial ports registered against a platform device. 741 * Remove serial ports registered against a platform device.
742 */ 742 */
743static int __devexit serial_hs_lpc32xx_remove(struct platform_device *pdev) 743static int serial_hs_lpc32xx_remove(struct platform_device *pdev)
744{ 744{
745 struct lpc32xx_hsuart_port *p = platform_get_drvdata(pdev); 745 struct lpc32xx_hsuart_port *p = platform_get_drvdata(pdev);
746 746
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index 8dd6189a40ee..7ce3197087bb 100644
--- a/drivers/tty/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
@@ -818,7 +818,7 @@ static int max3100_probe(struct spi_device *spi)
818 return 0; 818 return 0;
819} 819}
820 820
821static int __devexit max3100_remove(struct spi_device *spi) 821static int max3100_remove(struct spi_device *spi)
822{ 822{
823 struct max3100_port *s = dev_get_drvdata(&spi->dev); 823 struct max3100_port *s = dev_get_drvdata(&spi->dev);
824 int i; 824 int i;
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 88a227f9fe8c..3bb809d083aa 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1202,7 +1202,7 @@ err_out:
1202 return ret; 1202 return ret;
1203} 1203}
1204 1204
1205static int __devexit max310x_remove(struct spi_device *spi) 1205static int max310x_remove(struct spi_device *spi)
1206{ 1206{
1207 struct device *dev = &spi->dev; 1207 struct device *dev = &spi->dev;
1208 struct max310x_port *s = dev_get_drvdata(dev); 1208 struct max310x_port *s = dev_get_drvdata(dev);
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index e2b93d2f8f8c..fcd56ab6053f 100644
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -599,7 +599,7 @@ static int mcf_probe(struct platform_device *pdev)
599 599
600/****************************************************************************/ 600/****************************************************************************/
601 601
602static int __devexit mcf_remove(struct platform_device *pdev) 602static int mcf_remove(struct platform_device *pdev)
603{ 603{
604 struct uart_port *port; 604 struct uart_port *port;
605 int i; 605 int i;
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 41497fd3d360..58734d7e746d 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -855,7 +855,7 @@ err_get_page:
855 return ret; 855 return ret;
856} 856}
857 857
858static int __devexit serial_m3110_remove(struct spi_device *dev) 858static int serial_m3110_remove(struct spi_device *dev)
859{ 859{
860 struct uart_max3110 *max = spi_get_drvdata(dev); 860 struct uart_max3110 *max = spi_get_drvdata(dev);
861 861
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 033e0bc9ebab..95fd39be2934 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -917,7 +917,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
917 return uart_add_one_port(&msm_uart_driver, port); 917 return uart_add_one_port(&msm_uart_driver, port);
918} 918}
919 919
920static int __devexit msm_serial_remove(struct platform_device *pdev) 920static int msm_serial_remove(struct platform_device *pdev)
921{ 921{
922 struct msm_port *msm_port = platform_get_drvdata(pdev); 922 struct msm_port *msm_port = platform_get_drvdata(pdev);
923 923
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 02fb63e944eb..1fa92284ade0 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -401,7 +401,7 @@ static int msm_hs_request_port(struct uart_port *port)
401 return 0; 401 return 0;
402} 402}
403 403
404static int __devexit msm_hs_remove(struct platform_device *pdev) 404static int msm_hs_remove(struct platform_device *pdev)
405{ 405{
406 406
407 struct msm_hs_port *msm_uport; 407 struct msm_hs_port *msm_uport;
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index 27834646d018..e2775b6df5a5 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -520,7 +520,7 @@ static int __init mux_probe(struct parisc_device *dev)
520 return 0; 520 return 0;
521} 521}
522 522
523static int __devexit mux_remove(struct parisc_device *dev) 523static int mux_remove(struct parisc_device *dev)
524{ 524{
525 int i, j; 525 int i, j;
526 int port_count = (long)dev_get_drvdata(&dev->dev); 526 int port_count = (long)dev_get_drvdata(&dev->dev);
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 18b55c2d1d2e..3860ff27467c 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1137,7 +1137,7 @@ out:
1137 return ret; 1137 return ret;
1138} 1138}
1139 1139
1140static int __devexit mxs_auart_remove(struct platform_device *pdev) 1140static int mxs_auart_remove(struct platform_device *pdev)
1141{ 1141{
1142 struct mxs_auart_port *s = platform_get_drvdata(pdev); 1142 struct mxs_auart_port *s = platform_get_drvdata(pdev);
1143 1143
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index e777b16c4d17..b538e2e4ae5b 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1441,7 +1441,7 @@ err_port_line:
1441 return ret; 1441 return ret;
1442} 1442}
1443 1443
1444static int __devexit serial_omap_remove(struct platform_device *dev) 1444static int serial_omap_remove(struct platform_device *dev)
1445{ 1445{
1446 struct uart_omap_port *up = platform_get_drvdata(dev); 1446 struct uart_omap_port *up = platform_get_drvdata(dev);
1447 1447
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 6568beb4d370..82b48f60aa0c 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1256,7 +1256,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
1256 return ret; 1256 return ret;
1257} 1257}
1258 1258
1259static int __devexit s3c24xx_serial_remove(struct platform_device *dev) 1259static int s3c24xx_serial_remove(struct platform_device *dev)
1260{ 1260{
1261 struct uart_port *port = s3c24xx_dev_to_port(&dev->dev); 1261 struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
1262 1262
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index 1ddace83263f..418b495e3233 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -943,7 +943,7 @@ err_out:
943 return ret; 943 return ret;
944} 944}
945 945
946static int __devexit sccnxp_remove(struct platform_device *pdev) 946static int sccnxp_remove(struct platform_device *pdev)
947{ 947{
948 int i; 948 int i;
949 struct sccnxp_port *s = platform_get_drvdata(pdev); 949 struct sccnxp_port *s = platform_get_drvdata(pdev);
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index 23b28b8f4670..b52b21aeb250 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -1078,7 +1078,7 @@ static int serial_txx9_register_port(struct uart_port *port)
1078 * Remove one serial port. This may not be called from interrupt 1078 * Remove one serial port. This may not be called from interrupt
1079 * context. We hand the port back to the our control. 1079 * context. We hand the port back to the our control.
1080 */ 1080 */
1081static void __devexit serial_txx9_unregister_port(int line) 1081static void serial_txx9_unregister_port(int line)
1082{ 1082{
1083 struct uart_txx9_port *uart = &serial_txx9_ports[line]; 1083 struct uart_txx9_port *uart = &serial_txx9_ports[line];
1084 1084
@@ -1126,7 +1126,7 @@ static int serial_txx9_probe(struct platform_device *dev)
1126/* 1126/*
1127 * Remove serial ports registered against a platform device. 1127 * Remove serial ports registered against a platform device.
1128 */ 1128 */
1129static int __devexit serial_txx9_remove(struct platform_device *dev) 1129static int serial_txx9_remove(struct platform_device *dev)
1130{ 1130{
1131 int i; 1131 int i;
1132 1132
@@ -1217,7 +1217,7 @@ pciserial_txx9_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
1217 return 0; 1217 return 0;
1218} 1218}
1219 1219
1220static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev) 1220static void pciserial_txx9_remove_one(struct pci_dev *dev)
1221{ 1221{
1222 struct uart_txx9_port *up = pci_get_drvdata(dev); 1222 struct uart_txx9_port *up = pci_get_drvdata(dev);
1223 1223
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index cb58867036a0..b9bf9c53f7fd 100644
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -598,7 +598,7 @@ out_free_port:
598 return err; 598 return err;
599} 599}
600 600
601static int __devexit hv_remove(struct platform_device *dev) 601static int hv_remove(struct platform_device *dev)
602{ 602{
603 struct uart_port *port = dev_get_drvdata(&dev->dev); 603 struct uart_port *port = dev_get_drvdata(&dev->dev);
604 604
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 9a13c54d5f8a..bd8b3b634103 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -1063,7 +1063,7 @@ out:
1063 return err; 1063 return err;
1064} 1064}
1065 1065
1066static int __devexit sab_remove(struct platform_device *op) 1066static int sab_remove(struct platform_device *op)
1067{ 1067{
1068 struct uart_sunsab_port *up = dev_get_drvdata(&op->dev); 1068 struct uart_sunsab_port *up = dev_get_drvdata(&op->dev);
1069 1069
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 049bbc5bc769..220da3f9724f 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1503,7 +1503,7 @@ out_unmap:
1503 return err; 1503 return err;
1504} 1504}
1505 1505
1506static int __devexit su_remove(struct platform_device *op) 1506static int su_remove(struct platform_device *op)
1507{ 1507{
1508 struct uart_sunsu_port *up = dev_get_drvdata(&op->dev); 1508 struct uart_sunsu_port *up = dev_get_drvdata(&op->dev);
1509 bool kbdms = false; 1509 bool kbdms = false;
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 02c058fbefe5..aef4fab957c3 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -1507,7 +1507,7 @@ static int zs_probe(struct platform_device *op)
1507 return 0; 1507 return 0;
1508} 1508}
1509 1509
1510static void __devexit zs_remove_one(struct uart_sunzilog_port *up) 1510static void zs_remove_one(struct uart_sunzilog_port *up)
1511{ 1511{
1512 if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) { 1512 if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) {
1513#ifdef CONFIG_SERIO 1513#ifdef CONFIG_SERIO
@@ -1517,7 +1517,7 @@ static void __devexit zs_remove_one(struct uart_sunzilog_port *up)
1517 uart_remove_one_port(&sunzilog_reg, &up->port); 1517 uart_remove_one_port(&sunzilog_reg, &up->port);
1518} 1518}
1519 1519
1520static int __devexit zs_remove(struct platform_device *op) 1520static int zs_remove(struct platform_device *op)
1521{ 1521{
1522 struct uart_sunzilog_port *up = dev_get_drvdata(&op->dev); 1522 struct uart_sunzilog_port *up = dev_get_drvdata(&op->dev);
1523 struct zilog_layout __iomem *regs; 1523 struct zilog_layout __iomem *regs;
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index c833f50980b6..5be0d68feceb 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -492,7 +492,7 @@ err_mem:
492 return err; 492 return err;
493} 493}
494 494
495static int __devexit timbuart_remove(struct platform_device *dev) 495static int timbuart_remove(struct platform_device *dev)
496{ 496{
497 struct timbuart_port *uart = platform_get_drvdata(dev); 497 struct timbuart_port *uart = platform_get_drvdata(dev);
498 498
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 2d20b012b442..89eee43c4e2d 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -542,7 +542,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq)
542 * 542 *
543 * @dev: pointer to device structure 543 * @dev: pointer to device structure
544 */ 544 */
545static int __devexit ulite_release(struct device *dev) 545static int ulite_release(struct device *dev)
546{ 546{
547 struct uart_port *port = dev_get_drvdata(dev); 547 struct uart_port *port = dev_get_drvdata(dev);
548 int rc = 0; 548 int rc = 0;
@@ -593,7 +593,7 @@ static int ulite_probe(struct platform_device *pdev)
593 return ulite_assign(&pdev->dev, id, res->start, res2->start); 593 return ulite_assign(&pdev->dev, id, res->start, res2->start);
594} 594}
595 595
596static int __devexit ulite_remove(struct platform_device *pdev) 596static int ulite_remove(struct platform_device *pdev)
597{ 597{
598 return ulite_release(&pdev->dev); 598 return ulite_release(&pdev->dev);
599} 599}
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index c046c995534a..62ee0166bc65 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -901,7 +901,7 @@ static int siu_probe(struct platform_device *dev)
901 return 0; 901 return 0;
902} 902}
903 903
904static int __devexit siu_remove(struct platform_device *dev) 904static int siu_remove(struct platform_device *dev)
905{ 905{
906 struct uart_port *port; 906 struct uart_port *port;
907 int i; 907 int i;
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 80530c7d0025..8fd181436a6b 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -634,7 +634,7 @@ err:
634 return ret; 634 return ret;
635} 635}
636 636
637static int __devexit vt8500_serial_remove(struct platform_device *pdev) 637static int vt8500_serial_remove(struct platform_device *pdev)
638{ 638{
639 struct vt8500_port *vt8500_port = platform_get_drvdata(pdev); 639 struct vt8500_port *vt8500_port = platform_get_drvdata(pdev);
640 640
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 61fa71433a0e..9ab910370c56 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -997,7 +997,7 @@ static int xuartps_probe(struct platform_device *pdev)
997 * 997 *
998 * Returns 0 on success, negative error otherwise 998 * Returns 0 on success, negative error otherwise
999 **/ 999 **/
1000static int __devexit xuartps_remove(struct platform_device *pdev) 1000static int xuartps_remove(struct platform_device *pdev)
1001{ 1001{
1002 struct uart_port *port = dev_get_drvdata(&pdev->dev); 1002 struct uart_port *port = dev_get_drvdata(&pdev->dev);
1003 int rc = 0; 1003 int rc = 0;
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 4798dd5c55dd..9e071f6985f6 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -8117,7 +8117,7 @@ static int synclink_init_one (struct pci_dev *dev,
8117 return 0; 8117 return 0;
8118} 8118}
8119 8119
8120static void __devexit synclink_remove_one (struct pci_dev *dev) 8120static void synclink_remove_one (struct pci_dev *dev)
8121{ 8121{
8122} 8122}
8123 8123
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index a84c4089f56a..aba1e59f4a88 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3710,7 +3710,7 @@ static int init_one(struct pci_dev *dev,
3710 return 0; 3710 return 0;
3711} 3711}
3712 3712
3713static void __devexit remove_one(struct pci_dev *dev) 3713static void remove_one(struct pci_dev *dev)
3714{ 3714{
3715} 3715}
3716 3716
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index d301110b4d1a..fd43fb6f7cee 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -5606,6 +5606,6 @@ static int synclinkmp_init_one (struct pci_dev *dev,
5606 return 0; 5606 return 0;
5607} 5607}
5608 5608
5609static void __devexit synclinkmp_remove_one (struct pci_dev *dev) 5609static void synclinkmp_remove_one (struct pci_dev *dev)
5610{ 5610{
5611} 5611}