diff options
Diffstat (limited to 'drivers/tty/serial/8250')
-rw-r--r-- | drivers/tty/serial/8250/8250.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/8250/8250_acorn.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/8250/8250_em.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/8250/8250_hp300.c | 4 | ||||
-rw-r--r-- | drivers/tty/serial/8250/8250_pci.c | 12 | ||||
-rw-r--r-- | drivers/tty/serial/8250/8250_pnp.c | 2 |
7 files changed, 13 insertions, 13 deletions
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 | */ |
3038 | static int __devexit serial8250_remove(struct platform_device *dev) | 3038 | static 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 | ||
83 | static void __devexit serial_card_remove(struct expansion_card *ec) | 83 | static 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 | ||
155 | static int __devexit dw8250_remove(struct platform_device *pdev) | 155 | static 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 | ||
155 | static int __devexit serial8250_em_remove(struct platform_device *pdev) | 155 | static 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 | ||
39 | static int hpdca_init_one(struct dio_dev *d, | 39 | static int hpdca_init_one(struct dio_dev *d, |
40 | const struct dio_device_id *ent); | 40 | const struct dio_device_id *ent); |
41 | static void __devexit hpdca_remove_one(struct dio_dev *d); | 41 | static void hpdca_remove_one(struct dio_dev *d); |
42 | 42 | ||
43 | static struct dio_device_id hpdca_dio_tbl[] = { | 43 | static 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 |
291 | static void __devexit hpdca_remove_one(struct dio_dev *d) | 291 | static 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 | ||
291 | static void __devexit pci_plx9050_exit(struct pci_dev *dev) | 291 | static 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 | ||
316 | static void __devexit pci_ni8420_exit(struct pci_dev *dev) | 316 | static 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 | ||
348 | static void __devexit pci_ni8430_exit(struct pci_dev *dev) | 348 | static 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 | ||
425 | static void __devexit sbs_exit(struct pci_dev *dev) | 425 | static 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 | ||
994 | static void __devexit pci_ite887x_exit(struct pci_dev *dev) | 994 | static 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 | ||
2991 | static void __devexit pciserial_remove_one(struct pci_dev *dev) | 2991 | static 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 | ||
479 | static void __devexit serial_pnp_remove(struct pnp_dev *dev) | 479 | static 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) |