linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / serial / 8250_pci.c

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 851e483..94886c0 100644 (file)
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -134,7 +134,7 @@ afavlab_setup(struct serial_private *priv, struct pciserial_board *board,
  * and Keystone have one Diva chip with 3 UARTs.  Some later machines have
  * one Diva chip, but it has been expanded to 5 UARTs.
  */
-static int pci_hp_diva_init(struct pci_dev *dev)
+static int __devinit pci_hp_diva_init(struct pci_dev *dev)
 {
        int rc = 0;
 
@@ -194,7 +194,7 @@ pci_hp_diva_setup(struct serial_private *priv, struct pciserial_board *board,
 /*
  * Added for EKF Intel i960 serial boards
  */
-static int pci_inteli960ni_init(struct pci_dev *dev)
+static int __devinit pci_inteli960ni_init(struct pci_dev *dev)
 {
        unsigned long oldval;
 
@@ -216,7 +216,7 @@ static int pci_inteli960ni_init(struct pci_dev *dev)
  * seems to be mainly needed on card using the PLX which also use I/O
  * mapped memory.
  */
-static int pci_plx9050_init(struct pci_dev *dev)
+static int __devinit pci_plx9050_init(struct pci_dev *dev)
 {
        u8 irq_config;
        void __iomem *p;
@@ -314,7 +314,7 @@ sbs_setup(struct serial_private *priv, struct pciserial_board *board,
 /* global control register offset for SBS PMC-OctalPro */
 #define OCT_REG_CR_OFF         0x500
 
-static int sbs_init(struct pci_dev *dev)
+static int __devinit sbs_init(struct pci_dev *dev)
 {
        u8 __iomem *p;
 
@@ -458,11 +458,11 @@ static int pci_siig_setup(struct serial_private *priv,
  * growing *huge*, we use this function to collapse some 70 entries
  * in the PCI table into one, for sanity's and compactness's sake.
  */
-static const unsigned short timedia_single_port[] = {
+static unsigned short timedia_single_port[] = {
        0x4025, 0x4027, 0x4028, 0x5025, 0x5027, 0
 };
 
-static const unsigned short timedia_dual_port[] = {
+static unsigned short timedia_dual_port[] = {
        0x0002, 0x4036, 0x4037, 0x4038, 0x4078, 0x4079, 0x4085,
        0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079, 
        0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079, 
@@ -470,34 +470,35 @@ static const unsigned short timedia_dual_port[] = {
        0xD079, 0
 };
 
-static const unsigned short timedia_quad_port[] = {
+static unsigned short timedia_quad_port[] = {
        0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157, 
        0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159, 
        0x9256, 0x9257, 0xA056, 0xA157, 0xA158, 0xA159, 0xB056,
        0xB157, 0
 };
 
-static const unsigned short timedia_eight_port[] = {
+static unsigned short timedia_eight_port[] = {
        0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166, 
        0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0
 };
 
 static const struct timedia_struct {
        int num;
-       const unsigned short *ids;
+       unsigned short *ids;
 } timedia_data[] = {
        { 1, timedia_single_port },
        { 2, timedia_dual_port },
        { 4, timedia_quad_port },
-       { 8, timedia_eight_port }
+       { 8, timedia_eight_port },
+       { 0, NULL }
 };
 
-static int pci_timedia_init(struct pci_dev *dev)
+static int __devinit pci_timedia_init(struct pci_dev *dev)
 {
-       const unsigned short *ids;
+       unsigned short *ids;
        int i, j;
 
-       for (i = 0; i < ARRAY_SIZE(timedia_data); i++) {
+       for (i = 0; timedia_data[i].num; i++) {
                ids = timedia_data[i].ids;
                for (j = 0; ids[j]; j++)
                        if (dev->subsystem_device == ids[j])
@@ -565,13 +566,13 @@ titan_400l_800l_setup(struct serial_private *priv,
        return setup_port(priv, port, bar, offset, board->reg_shift);
 }
 
-static int pci_xircom_init(struct pci_dev *dev)
+static int __devinit pci_xircom_init(struct pci_dev *dev)
 {
        msleep(100);
        return 0;
 }
 
-static int pci_netmos_init(struct pci_dev *dev)
+static int __devinit pci_netmos_init(struct pci_dev *dev)
 {
        /* subdevice 0x00PS means <P> parallel, <S> serial */
        unsigned int num_serial = dev->subsystem_device & 0xf;
@@ -593,8 +594,8 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
        else
                offset += idx * board->uart_offset;
 
-       maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) >>
-               (board->reg_shift + 3);
+       maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) /
+               (8 << board->reg_shift);
 
        if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
                return 1;
@@ -621,7 +622,7 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
  */
 static struct pci_serial_quirk pci_serial_quirks[] = {
        /*
-        * AFAVLAB cards - these may be called via parport_serial
+        * AFAVLAB cards.
         *  It is not clear whether this applies to all products.
         */
        {
@@ -753,7 +754,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
                .exit           = __devexit_p(sbs_exit),
        },
        /*
-        * SIIG cards - these may be called via parport_serial
+        * SIIG cards.
         */
        {
                .vendor         = PCI_VENDOR_ID_SIIG,
@@ -810,7 +811,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
                .setup          = pci_default_setup,
        },
        /*
-        * Netmos cards - these may be called via parport_serial
+        * Netmos cards
         */
        {
                .vendor         = PCI_VENDOR_ID_NETMOS,
@@ -935,7 +936,6 @@ enum pci_board_num_t {
        pbn_b1_8_1382400,
 
        pbn_b2_1_115200,
-       pbn_b2_2_115200,
        pbn_b2_8_115200,
 
        pbn_b2_1_460800,
@@ -1243,12 +1243,6 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                .base_baud      = 115200,
                .uart_offset    = 8,
        },
-       [pbn_b2_2_115200] = {
-               .flags          = FL_BASE2,
-               .num_ports      = 2,
-               .base_baud      = 115200,
-               .uart_offset    = 8,
-       },
        [pbn_b2_8_115200] = {
                .flags          = FL_BASE2,
                .num_ports      = 8,
@@ -2345,13 +2339,6 @@ static struct pci_device_id serial_pci_tbl[] = {
                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                pbn_b0_1_115200 },
 
-       /*
-        * IntaShield IS-200
-        */
-       {       PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,   /* 135a.0811 */
-               pbn_b2_2_115200 },
-
        /*
         * These entries match devices with class COMMUNICATION_SERIAL,
         * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL