diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:31:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:31:05 -0400 |
commit | 075395d228641646159dae3dd170fa3fc6ff477a (patch) | |
tree | 7cd5ace653d722549b23a2594140084c49bfcad6 /drivers/serial/8250_pci.c | |
parent | 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 (diff) | |
parent | 61a116ef29e712147d7ee7a6738886e6f91df5f5 (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Ensure 8250_pci quirks are not marked __devinit
[SERIAL] Convert fifosize to an unsigned int
Diffstat (limited to 'drivers/serial/8250_pci.c')
-rw-r--r-- | drivers/serial/8250_pci.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 864ef859be56..a1d322f8a16c 100644 --- 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, | |||
134 | * and Keystone have one Diva chip with 3 UARTs. Some later machines have | 134 | * and Keystone have one Diva chip with 3 UARTs. Some later machines have |
135 | * one Diva chip, but it has been expanded to 5 UARTs. | 135 | * one Diva chip, but it has been expanded to 5 UARTs. |
136 | */ | 136 | */ |
137 | static int __devinit pci_hp_diva_init(struct pci_dev *dev) | 137 | static int pci_hp_diva_init(struct pci_dev *dev) |
138 | { | 138 | { |
139 | int rc = 0; | 139 | int rc = 0; |
140 | 140 | ||
@@ -194,7 +194,7 @@ pci_hp_diva_setup(struct serial_private *priv, struct pciserial_board *board, | |||
194 | /* | 194 | /* |
195 | * Added for EKF Intel i960 serial boards | 195 | * Added for EKF Intel i960 serial boards |
196 | */ | 196 | */ |
197 | static int __devinit pci_inteli960ni_init(struct pci_dev *dev) | 197 | static int pci_inteli960ni_init(struct pci_dev *dev) |
198 | { | 198 | { |
199 | unsigned long oldval; | 199 | unsigned long oldval; |
200 | 200 | ||
@@ -216,7 +216,7 @@ static int __devinit pci_inteli960ni_init(struct pci_dev *dev) | |||
216 | * seems to be mainly needed on card using the PLX which also use I/O | 216 | * seems to be mainly needed on card using the PLX which also use I/O |
217 | * mapped memory. | 217 | * mapped memory. |
218 | */ | 218 | */ |
219 | static int __devinit pci_plx9050_init(struct pci_dev *dev) | 219 | static int pci_plx9050_init(struct pci_dev *dev) |
220 | { | 220 | { |
221 | u8 irq_config; | 221 | u8 irq_config; |
222 | void __iomem *p; | 222 | void __iomem *p; |
@@ -314,7 +314,7 @@ sbs_setup(struct serial_private *priv, struct pciserial_board *board, | |||
314 | /* global control register offset for SBS PMC-OctalPro */ | 314 | /* global control register offset for SBS PMC-OctalPro */ |
315 | #define OCT_REG_CR_OFF 0x500 | 315 | #define OCT_REG_CR_OFF 0x500 |
316 | 316 | ||
317 | static int __devinit sbs_init(struct pci_dev *dev) | 317 | static int sbs_init(struct pci_dev *dev) |
318 | { | 318 | { |
319 | u8 __iomem *p; | 319 | u8 __iomem *p; |
320 | 320 | ||
@@ -493,7 +493,7 @@ static const struct timedia_struct { | |||
493 | { 0, NULL } | 493 | { 0, NULL } |
494 | }; | 494 | }; |
495 | 495 | ||
496 | static int __devinit pci_timedia_init(struct pci_dev *dev) | 496 | static int pci_timedia_init(struct pci_dev *dev) |
497 | { | 497 | { |
498 | unsigned short *ids; | 498 | unsigned short *ids; |
499 | int i, j; | 499 | int i, j; |
@@ -566,13 +566,13 @@ titan_400l_800l_setup(struct serial_private *priv, | |||
566 | return setup_port(priv, port, bar, offset, board->reg_shift); | 566 | return setup_port(priv, port, bar, offset, board->reg_shift); |
567 | } | 567 | } |
568 | 568 | ||
569 | static int __devinit pci_xircom_init(struct pci_dev *dev) | 569 | static int pci_xircom_init(struct pci_dev *dev) |
570 | { | 570 | { |
571 | msleep(100); | 571 | msleep(100); |
572 | return 0; | 572 | return 0; |
573 | } | 573 | } |
574 | 574 | ||
575 | static int __devinit pci_netmos_init(struct pci_dev *dev) | 575 | static int pci_netmos_init(struct pci_dev *dev) |
576 | { | 576 | { |
577 | /* subdevice 0x00PS means <P> parallel, <S> serial */ | 577 | /* subdevice 0x00PS means <P> parallel, <S> serial */ |
578 | unsigned int num_serial = dev->subsystem_device & 0xf; | 578 | unsigned int num_serial = dev->subsystem_device & 0xf; |
@@ -622,7 +622,7 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board, | |||
622 | */ | 622 | */ |
623 | static struct pci_serial_quirk pci_serial_quirks[] = { | 623 | static struct pci_serial_quirk pci_serial_quirks[] = { |
624 | /* | 624 | /* |
625 | * AFAVLAB cards. | 625 | * AFAVLAB cards - these may be called via parport_serial |
626 | * It is not clear whether this applies to all products. | 626 | * It is not clear whether this applies to all products. |
627 | */ | 627 | */ |
628 | { | 628 | { |
@@ -754,7 +754,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { | |||
754 | .exit = __devexit_p(sbs_exit), | 754 | .exit = __devexit_p(sbs_exit), |
755 | }, | 755 | }, |
756 | /* | 756 | /* |
757 | * SIIG cards. | 757 | * SIIG cards - these may be called via parport_serial |
758 | */ | 758 | */ |
759 | { | 759 | { |
760 | .vendor = PCI_VENDOR_ID_SIIG, | 760 | .vendor = PCI_VENDOR_ID_SIIG, |
@@ -811,7 +811,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = { | |||
811 | .setup = pci_default_setup, | 811 | .setup = pci_default_setup, |
812 | }, | 812 | }, |
813 | /* | 813 | /* |
814 | * Netmos cards | 814 | * Netmos cards - these may be called via parport_serial |
815 | */ | 815 | */ |
816 | { | 816 | { |
817 | .vendor = PCI_VENDOR_ID_NETMOS, | 817 | .vendor = PCI_VENDOR_ID_NETMOS, |