1 files changed, 12 insertions, 20 deletions

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index ef6169adb84..e9c32274df3 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -62,7 +62,6 @@ enum parport_pc_pci_cards {
         timedia_9079a,
         timedia_9079b,
         timedia_9079c,
-        wch_ch353_2s1p,
 };
 
 /* each element directly indexed from enum list, above */
@@ -87,8 +86,7 @@ struct parport_pc_pci {
                                 struct parport_pc_pci *card, int failed);
 };
 
-static int netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par,
-                                int autoirq, int autodma)
+static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par, int autoirq, int autodma)
 {
         /* the rule described below doesn't hold for this device */
         if (dev->device == PCI_DEVICE_ID_NETMOS_9835 &&
@@ -112,7 +110,7 @@ static int netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par,
         return 0;
 }
 
-static struct parport_pc_pci cards[] = {
+static struct parport_pc_pci cards[] __devinitdata = {
         /* titan_110l */                { 1, { { 3, -1 }, } },
         /* titan_210l */                { 1, { { 3, -1 }, } },
         /* netmos_9xx5_combo */         { 1, { { 2, -1 }, }, netmos_parallel_init },
@@ -147,7 +145,6 @@ static struct parport_pc_pci cards[] = {
         /* timedia_9079a */             { 1, { { 2, 3 }, } },
         /* timedia_9079b */             { 1, { { 2, 3 }, } },
         /* timedia_9079c */             { 1, { { 2, 3 }, } },
-        /* wch_ch353_2s1p*/             { 1, { { 2, -1}, } },
 };
 
 static struct pci_device_id parport_serial_pci_tbl[] = {
@@ -246,8 +243,7 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
         { 0x1409, 0x7168, 0x1409, 0xb079, 0, 0, timedia_9079a },
         { 0x1409, 0x7168, 0x1409, 0xc079, 0, 0, timedia_9079b },
         { 0x1409, 0x7168, 0x1409, 0xd079, 0, 0, timedia_9079c },
-        /* WCH CARDS */
-        { 0x4348, 0x7053, 0x4348, 0x3253, 0, 0, wch_ch353_2s1p},
+
         { 0, } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl);
@@ -259,7 +255,7 @@ MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl);
  * Cards not tested are marked n/t
  * If you have one of these cards and it works for you, please tell me..
  */
-static struct pciserial_board pci_parport_serial_boards[] = {
+static struct pciserial_board pci_parport_serial_boards[] __devinitdata = {
         [titan_110l] = {
                 .flags          = FL_BASE1 | FL_BASE_BARS,
                 .num_ports      = 1,
@@ -464,12 +460,6 @@ static struct pciserial_board pci_parport_serial_boards[] = {
                 .base_baud      = 921600,
                 .uart_offset    = 8,
         },
-        [wch_ch353_2s1p] = {
-                .flags          = FL_BASE0|FL_BASE_BARS,
-                .num_ports      = 2,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
 };
 
 struct parport_serial_private {
@@ -480,7 +470,8 @@ struct parport_serial_private {
 };
 
 /* Register the serial port(s) of a PCI card. */
-static int serial_register(struct pci_dev *dev, const struct pci_device_id *id)
+static int __devinit serial_register (struct pci_dev *dev,
+                                      const struct pci_device_id *id)
 {
         struct parport_serial_private *priv = pci_get_drvdata (dev);
         struct pciserial_board *board;
@@ -501,7 +492,8 @@ static int serial_register(struct pci_dev *dev, const struct pci_device_id *id)
 }
 
 /* Register the parallel port(s) of a PCI card. */
-static int parport_register(struct pci_dev *dev, const struct pci_device_id *id)
+static int __devinit parport_register (struct pci_dev *dev,
+                                       const struct pci_device_id *id)
 {
         struct parport_pc_pci *card;
         struct parport_serial_private *priv = pci_get_drvdata (dev);
@@ -562,8 +554,8 @@ static int parport_register(struct pci_dev *dev, const struct pci_device_id *id)
         return 0;
 }
 
-static int parport_serial_pci_probe(struct pci_dev *dev,
-                                    const struct pci_device_id *id)
+static int __devinit parport_serial_pci_probe (struct pci_dev *dev,
+                                               const struct pci_device_id *id)
 {
         struct parport_serial_private *priv;
         int err;
@@ -598,7 +590,7 @@ static int parport_serial_pci_probe(struct pci_dev *dev,
         return 0;
 }
 
-static void parport_serial_pci_remove(struct pci_dev *dev)
+static void __devexit parport_serial_pci_remove (struct pci_dev *dev)
 {
         struct parport_serial_private *priv = pci_get_drvdata (dev);
         int i;
@@ -663,7 +655,7 @@ static struct pci_driver parport_serial_pci_driver = {
         .name           = "parport_serial",
         .id_table       = parport_serial_pci_tbl,
         .probe          = parport_serial_pci_probe,
-        .remove         = parport_serial_pci_remove,
+        .remove         = __devexit_p(parport_serial_pci_remove),
 #ifdef CONFIG_PM
         .suspend        = parport_serial_pci_suspend,
         .resume         = parport_serial_pci_resume,