aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:24:32 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 18:25:06 -0500
commitde88b34042752c03771b779d1d985060909ab44a (patch)
tree3393b75581f122f9dfaba5dc540238c3d4a11090 /drivers
parent6b1cb9305094052d282e039b11a6e667ac48559e (diff)
tty: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Alan Cox <alan@linux.intel.com> Cc: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/hvc/hvc_opal.c2
-rw-r--r--drivers/tty/hvc/hvc_vio.c2
-rw-r--r--drivers/tty/rocket.c2
-rw-r--r--drivers/tty/serial/8250/8250_pci.c2
-rw-r--r--drivers/tty/serial/8250/8250_pnp.c2
-rw-r--r--drivers/tty/serial/of_serial.c2
-rw-r--r--drivers/tty/serial/sirfsoc_uart.c2
-rw-r--r--drivers/tty/serial/uartlite.c2
-rw-r--r--drivers/tty/serial/xilinx_uartps.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 79f2b5e17f8d..61da5cd093fc 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -41,7 +41,7 @@
41 41
42static const char hvc_opal_name[] = "hvc_opal"; 42static const char hvc_opal_name[] = "hvc_opal";
43 43
44static struct of_device_id hvc_opal_match[] __devinitdata = { 44static struct of_device_id hvc_opal_match[] = {
45 { .name = "serial", .compatible = "ibm,opal-console-raw" }, 45 { .name = "serial", .compatible = "ibm,opal-console-raw" },
46 { .name = "serial", .compatible = "ibm,opal-console-hvsi" }, 46 { .name = "serial", .compatible = "ibm,opal-console-hvsi" },
47 { }, 47 { },
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 77bde6c2cfa0..282d143a6437 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -53,7 +53,7 @@
53 53
54static const char hvc_driver_name[] = "hvc_console"; 54static const char hvc_driver_name[] = "hvc_console";
55 55
56static struct vio_device_id hvc_driver_table[] __devinitdata = { 56static struct vio_device_id hvc_driver_table[] = {
57 {"serial", "hvterm1"}, 57 {"serial", "hvterm1"},
58#ifndef HVC_OLD_HVSI 58#ifndef HVC_OLD_HVSI
59 {"serial", "hvterm-protocol"}, 59 {"serial", "hvterm-protocol"},
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index d9056dac4ea1..e42009a00529 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -1758,7 +1758,7 @@ static void rp_flush_buffer(struct tty_struct *tty)
1758 1758
1759#ifdef CONFIG_PCI 1759#ifdef CONFIG_PCI
1760 1760
1761static struct pci_device_id __devinitdata __used rocket_pci_ids[] = { 1761static struct pci_device_id __used rocket_pci_ids[] = {
1762 { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) }, 1762 { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) },
1763 { } 1763 { }
1764}; 1764};
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index a5acb57b5ba0..3252c5d47ff8 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1987,7 +1987,7 @@ enum pci_board_num_t {
1987 * see first lines of serial_in() and serial_out() in 8250.c 1987 * see first lines of serial_in() and serial_out() in 8250.c
1988*/ 1988*/
1989 1989
1990static struct pciserial_board pci_boards[] __devinitdata = { 1990static struct pciserial_board pci_boards[] = {
1991 [pbn_default] = { 1991 [pbn_default] = {
1992 .flags = FL_BASE0, 1992 .flags = FL_BASE0,
1993 .num_ports = 1, 1993 .num_ports = 1,
diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index 2b8a6ac173f6..71daae90fb5e 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -370,7 +370,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
370 370
371MODULE_DEVICE_TABLE(pnp, pnp_dev_table); 371MODULE_DEVICE_TABLE(pnp, pnp_dev_table);
372 372
373static char *modem_names[] __devinitdata = { 373static char *modem_names[] = {
374 "MODEM", "Modem", "modem", "FAX", "Fax", "fax", 374 "MODEM", "Modem", "modem", "FAX", "Fax", "fax",
375 "56K", "56k", "K56", "33.6", "28.8", "14.4", 375 "56K", "56k", "K56", "33.6", "28.8", "14.4",
376 "33,600", "28,800", "14,400", "33.600", "28.800", "14.400", 376 "33,600", "28,800", "14,400", "33.600", "28.800", "14.400",
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 1bce344ca794..e7cae1c2d7d2 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -231,7 +231,7 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
231/* 231/*
232 * A few common types, add more as needed. 232 * A few common types, add more as needed.
233 */ 233 */
234static struct of_device_id __devinitdata of_platform_serial_table[] = { 234static struct of_device_id of_platform_serial_table[] = {
235 { .compatible = "ns8250", .data = (void *)PORT_8250, }, 235 { .compatible = "ns8250", .data = (void *)PORT_8250, },
236 { .compatible = "ns16450", .data = (void *)PORT_16450, }, 236 { .compatible = "ns16450", .data = (void *)PORT_16450, },
237 { .compatible = "ns16550a", .data = (void *)PORT_16550A, }, 237 { .compatible = "ns16550a", .data = (void *)PORT_16550A, },
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 49849843ff82..5da5cb962769 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -727,7 +727,7 @@ static int sirfsoc_uart_resume(struct platform_device *pdev)
727 return 0; 727 return 0;
728} 728}
729 729
730static struct of_device_id sirfsoc_uart_ids[] __devinitdata = { 730static struct of_device_id sirfsoc_uart_ids[] = {
731 { .compatible = "sirf,prima2-uart", }, 731 { .compatible = "sirf,prima2-uart", },
732 {} 732 {}
733}; 733};
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index df9eeb451ae9..2d20b012b442 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -562,7 +562,7 @@ static int __devexit ulite_release(struct device *dev)
562 562
563#if defined(CONFIG_OF) 563#if defined(CONFIG_OF)
564/* Match table for of_platform binding */ 564/* Match table for of_platform binding */
565static struct of_device_id ulite_of_match[] __devinitdata = { 565static struct of_device_id ulite_of_match[] = {
566 { .compatible = "xlnx,opb-uartlite-1.00.b", }, 566 { .compatible = "xlnx,opb-uartlite-1.00.b", },
567 { .compatible = "xlnx,xps-uartlite-1.00.a", }, 567 { .compatible = "xlnx,xps-uartlite-1.00.a", },
568 {} 568 {}
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index a1cd2df51c9e..61fa71433a0e 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1040,7 +1040,7 @@ static int xuartps_resume(struct platform_device *pdev)
1040} 1040}
1041 1041
1042/* Match table for of_platform binding */ 1042/* Match table for of_platform binding */
1043static struct of_device_id xuartps_of_match[] __devinitdata = { 1043static struct of_device_id xuartps_of_match[] = {
1044 { .compatible = "xlnx,xuartps", }, 1044 { .compatible = "xlnx,xuartps", },
1045 {} 1045 {}
1046}; 1046};