diff options
Diffstat (limited to 'drivers/parport/parport_serial.c')
-rw-r--r-- | drivers/parport/parport_serial.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index 1631eeaf440e..ef6169adb845 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c | |||
@@ -87,7 +87,8 @@ struct parport_pc_pci { | |||
87 | struct parport_pc_pci *card, int failed); | 87 | struct parport_pc_pci *card, int failed); |
88 | }; | 88 | }; |
89 | 89 | ||
90 | static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par, int autoirq, int autodma) | 90 | static int netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par, |
91 | int autoirq, int autodma) | ||
91 | { | 92 | { |
92 | /* the rule described below doesn't hold for this device */ | 93 | /* the rule described below doesn't hold for this device */ |
93 | if (dev->device == PCI_DEVICE_ID_NETMOS_9835 && | 94 | if (dev->device == PCI_DEVICE_ID_NETMOS_9835 && |
@@ -111,7 +112,7 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc | |||
111 | return 0; | 112 | return 0; |
112 | } | 113 | } |
113 | 114 | ||
114 | static struct parport_pc_pci cards[] __devinitdata = { | 115 | static struct parport_pc_pci cards[] = { |
115 | /* titan_110l */ { 1, { { 3, -1 }, } }, | 116 | /* titan_110l */ { 1, { { 3, -1 }, } }, |
116 | /* titan_210l */ { 1, { { 3, -1 }, } }, | 117 | /* titan_210l */ { 1, { { 3, -1 }, } }, |
117 | /* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init }, | 118 | /* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init }, |
@@ -258,7 +259,7 @@ MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); | |||
258 | * Cards not tested are marked n/t | 259 | * Cards not tested are marked n/t |
259 | * If you have one of these cards and it works for you, please tell me.. | 260 | * If you have one of these cards and it works for you, please tell me.. |
260 | */ | 261 | */ |
261 | static struct pciserial_board pci_parport_serial_boards[] __devinitdata = { | 262 | static struct pciserial_board pci_parport_serial_boards[] = { |
262 | [titan_110l] = { | 263 | [titan_110l] = { |
263 | .flags = FL_BASE1 | FL_BASE_BARS, | 264 | .flags = FL_BASE1 | FL_BASE_BARS, |
264 | .num_ports = 1, | 265 | .num_ports = 1, |
@@ -479,8 +480,7 @@ struct parport_serial_private { | |||
479 | }; | 480 | }; |
480 | 481 | ||
481 | /* Register the serial port(s) of a PCI card. */ | 482 | /* Register the serial port(s) of a PCI card. */ |
482 | static int __devinit serial_register (struct pci_dev *dev, | 483 | static int serial_register(struct pci_dev *dev, const struct pci_device_id *id) |
483 | const struct pci_device_id *id) | ||
484 | { | 484 | { |
485 | struct parport_serial_private *priv = pci_get_drvdata (dev); | 485 | struct parport_serial_private *priv = pci_get_drvdata (dev); |
486 | struct pciserial_board *board; | 486 | struct pciserial_board *board; |
@@ -501,8 +501,7 @@ static int __devinit serial_register (struct pci_dev *dev, | |||
501 | } | 501 | } |
502 | 502 | ||
503 | /* Register the parallel port(s) of a PCI card. */ | 503 | /* Register the parallel port(s) of a PCI card. */ |
504 | static int __devinit parport_register (struct pci_dev *dev, | 504 | static int parport_register(struct pci_dev *dev, const struct pci_device_id *id) |
505 | const struct pci_device_id *id) | ||
506 | { | 505 | { |
507 | struct parport_pc_pci *card; | 506 | struct parport_pc_pci *card; |
508 | struct parport_serial_private *priv = pci_get_drvdata (dev); | 507 | struct parport_serial_private *priv = pci_get_drvdata (dev); |
@@ -563,8 +562,8 @@ static int __devinit parport_register (struct pci_dev *dev, | |||
563 | return 0; | 562 | return 0; |
564 | } | 563 | } |
565 | 564 | ||
566 | static int __devinit parport_serial_pci_probe (struct pci_dev *dev, | 565 | static int parport_serial_pci_probe(struct pci_dev *dev, |
567 | const struct pci_device_id *id) | 566 | const struct pci_device_id *id) |
568 | { | 567 | { |
569 | struct parport_serial_private *priv; | 568 | struct parport_serial_private *priv; |
570 | int err; | 569 | int err; |
@@ -599,7 +598,7 @@ static int __devinit parport_serial_pci_probe (struct pci_dev *dev, | |||
599 | return 0; | 598 | return 0; |
600 | } | 599 | } |
601 | 600 | ||
602 | static void __devexit parport_serial_pci_remove (struct pci_dev *dev) | 601 | static void parport_serial_pci_remove(struct pci_dev *dev) |
603 | { | 602 | { |
604 | struct parport_serial_private *priv = pci_get_drvdata (dev); | 603 | struct parport_serial_private *priv = pci_get_drvdata (dev); |
605 | int i; | 604 | int i; |
@@ -664,7 +663,7 @@ static struct pci_driver parport_serial_pci_driver = { | |||
664 | .name = "parport_serial", | 663 | .name = "parport_serial", |
665 | .id_table = parport_serial_pci_tbl, | 664 | .id_table = parport_serial_pci_tbl, |
666 | .probe = parport_serial_pci_probe, | 665 | .probe = parport_serial_pci_probe, |
667 | .remove = __devexit_p(parport_serial_pci_remove), | 666 | .remove = parport_serial_pci_remove, |
668 | #ifdef CONFIG_PM | 667 | #ifdef CONFIG_PM |
669 | .suspend = parport_serial_pci_suspend, | 668 | .suspend = parport_serial_pci_suspend, |
670 | .resume = parport_serial_pci_resume, | 669 | .resume = parport_serial_pci_resume, |