aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/stallion.c28
1 files changed, 9 insertions, 19 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index f49f145e20ee..639a0569e6f2 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -496,16 +496,6 @@ static void stl_offintr(struct work_struct *);
496static struct stlbrd *stl_allocbrd(void); 496static struct stlbrd *stl_allocbrd(void);
497static struct stlport *stl_getport(int brdnr, int panelnr, int portnr); 497static struct stlport *stl_getport(int brdnr, int panelnr, int portnr);
498 498
499static inline int stl_initbrds(void);
500static inline int stl_initeio(struct stlbrd *brdp);
501static inline int stl_initech(struct stlbrd *brdp);
502static inline int stl_getbrdnr(void);
503
504#ifdef CONFIG_PCI
505static inline int stl_findpcibrds(void);
506static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp);
507#endif
508
509/* 499/*
510 * CD1400 uart specific handling functions. 500 * CD1400 uart specific handling functions.
511 */ 501 */
@@ -2024,7 +2014,7 @@ static int __init stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)
2024 * Try to find and initialize an EasyIO board. 2014 * Try to find and initialize an EasyIO board.
2025 */ 2015 */
2026 2016
2027static inline int stl_initeio(struct stlbrd *brdp) 2017static int stl_initeio(struct stlbrd *brdp)
2028{ 2018{
2029 struct stlpanel *panelp; 2019 struct stlpanel *panelp;
2030 unsigned int status; 2020 unsigned int status;
@@ -2165,7 +2155,7 @@ static inline int stl_initeio(struct stlbrd *brdp)
2165 * dealing with all types of ECH board. 2155 * dealing with all types of ECH board.
2166 */ 2156 */
2167 2157
2168static inline int stl_initech(struct stlbrd *brdp) 2158static int stl_initech(struct stlbrd *brdp)
2169{ 2159{
2170 struct stlpanel *panelp; 2160 struct stlpanel *panelp;
2171 unsigned int status, nxtid, ioaddr, conflict; 2161 unsigned int status, nxtid, ioaddr, conflict;
@@ -2424,7 +2414,7 @@ static int __init stl_brdinit(struct stlbrd *brdp)
2424 * Find the next available board number that is free. 2414 * Find the next available board number that is free.
2425 */ 2415 */
2426 2416
2427static inline int stl_getbrdnr(void) 2417static int stl_getbrdnr(void)
2428{ 2418{
2429 int i; 2419 int i;
2430 2420
@@ -2448,7 +2438,7 @@ static inline int stl_getbrdnr(void)
2448 * configuration space. 2438 * configuration space.
2449 */ 2439 */
2450 2440
2451static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp) 2441static int stl_initpcibrd(int brdtype, struct pci_dev *devp)
2452{ 2442{
2453 struct stlbrd *brdp; 2443 struct stlbrd *brdp;
2454 2444
@@ -2510,7 +2500,7 @@ static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp)
2510 */ 2500 */
2511 2501
2512 2502
2513static inline int stl_findpcibrds(void) 2503static int stl_findpcibrds(void)
2514{ 2504{
2515 struct pci_dev *dev = NULL; 2505 struct pci_dev *dev = NULL;
2516 int i, rc; 2506 int i, rc;
@@ -2546,7 +2536,7 @@ static inline int stl_findpcibrds(void)
2546 * since the initial search and setup is too different. 2536 * since the initial search and setup is too different.
2547 */ 2537 */
2548 2538
2549static inline int stl_initbrds(void) 2539static int stl_initbrds(void)
2550{ 2540{
2551 struct stlbrd *brdp; 2541 struct stlbrd *brdp;
2552 struct stlconf *confp; 2542 struct stlconf *confp;
@@ -3596,7 +3586,7 @@ static void stl_cd1400echintr(struct stlpanel *panelp, unsigned int iobase)
3596 * this is the only way to generate them on the cd1400. 3586 * this is the only way to generate them on the cd1400.
3597 */ 3587 */
3598 3588
3599static inline int stl_cd1400breakisr(struct stlport *portp, int ioaddr) 3589static int stl_cd1400breakisr(struct stlport *portp, int ioaddr)
3600{ 3590{
3601 if (portp->brklen == 1) { 3591 if (portp->brklen == 1) {
3602 outb((COR2 + portp->uartaddr), ioaddr); 3592 outb((COR2 + portp->uartaddr), ioaddr);
@@ -4520,7 +4510,7 @@ static void stl_sc26198wait(struct stlport *portp)
4520 * automatic flow control modes of the sc26198. 4510 * automatic flow control modes of the sc26198.
4521 */ 4511 */
4522 4512
4523static inline void stl_sc26198txunflow(struct stlport *portp, struct tty_struct *tty) 4513static void stl_sc26198txunflow(struct stlport *portp, struct tty_struct *tty)
4524{ 4514{
4525 unsigned char mr0; 4515 unsigned char mr0;
4526 4516
@@ -4691,7 +4681,7 @@ static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)
4691 * Process an RX bad character. 4681 * Process an RX bad character.
4692 */ 4682 */
4693 4683
4694static inline void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char ch) 4684static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char ch)
4695{ 4685{
4696 struct tty_struct *tty; 4686 struct tty_struct *tty;
4697 unsigned int ioaddr; 4687 unsigned int ioaddr;