Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43684
b: refs/heads/master
c: 60be481
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent eb67cbf commit 4b1c118
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23b85a152b4598ae007db7d5a5318458ea2fd647
refs/heads/master: 60be481089524b88fc777433494c6842f1f652a4
28 changes: 9 additions & 19 deletions trunk/drivers/char/stallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -496,16 +496,6 @@ static void stl_offintr(struct work_struct *);
static struct stlbrd *stl_allocbrd(void);
static struct stlport *stl_getport(int brdnr, int panelnr, int portnr);

static inline int stl_initbrds(void);
static inline int stl_initeio(struct stlbrd *brdp);
static inline int stl_initech(struct stlbrd *brdp);
static inline int stl_getbrdnr(void);

#ifdef CONFIG_PCI
static inline int stl_findpcibrds(void);
static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp);
#endif

/*
* CD1400 uart specific handling functions.
*/
Expand Down Expand Up @@ -2024,7 +2014,7 @@ static int __init stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)
* Try to find and initialize an EasyIO board.
*/

static inline int stl_initeio(struct stlbrd *brdp)
static int stl_initeio(struct stlbrd *brdp)
{
struct stlpanel *panelp;
unsigned int status;
Expand Down Expand Up @@ -2165,7 +2155,7 @@ static inline int stl_initeio(struct stlbrd *brdp)
* dealing with all types of ECH board.
*/

static inline int stl_initech(struct stlbrd *brdp)
static int stl_initech(struct stlbrd *brdp)
{
struct stlpanel *panelp;
unsigned int status, nxtid, ioaddr, conflict;
Expand Down Expand Up @@ -2424,7 +2414,7 @@ static int __init stl_brdinit(struct stlbrd *brdp)
* Find the next available board number that is free.
*/

static inline int stl_getbrdnr(void)
static int stl_getbrdnr(void)
{
int i;

Expand All @@ -2448,7 +2438,7 @@ static inline int stl_getbrdnr(void)
* configuration space.
*/

static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp)
static int stl_initpcibrd(int brdtype, struct pci_dev *devp)
{
struct stlbrd *brdp;

Expand Down Expand Up @@ -2510,7 +2500,7 @@ static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp)
*/


static inline int stl_findpcibrds(void)
static int stl_findpcibrds(void)
{
struct pci_dev *dev = NULL;
int i, rc;
Expand Down Expand Up @@ -2546,7 +2536,7 @@ static inline int stl_findpcibrds(void)
* since the initial search and setup is too different.
*/

static inline int stl_initbrds(void)
static int stl_initbrds(void)
{
struct stlbrd *brdp;
struct stlconf *confp;
Expand Down Expand Up @@ -3596,7 +3586,7 @@ static void stl_cd1400echintr(struct stlpanel *panelp, unsigned int iobase)
* this is the only way to generate them on the cd1400.
*/

static inline int stl_cd1400breakisr(struct stlport *portp, int ioaddr)
static int stl_cd1400breakisr(struct stlport *portp, int ioaddr)
{
if (portp->brklen == 1) {
outb((COR2 + portp->uartaddr), ioaddr);
Expand Down Expand Up @@ -4520,7 +4510,7 @@ static void stl_sc26198wait(struct stlport *portp)
* automatic flow control modes of the sc26198.
*/

static inline void stl_sc26198txunflow(struct stlport *portp, struct tty_struct *tty)
static void stl_sc26198txunflow(struct stlport *portp, struct tty_struct *tty)
{
unsigned char mr0;

Expand Down Expand Up @@ -4691,7 +4681,7 @@ static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)
* Process an RX bad character.
*/

static inline void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char ch)
static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char ch)
{
struct tty_struct *tty;
unsigned int ioaddr;
Expand Down

0 comments on commit 4b1c118

Please sign in to comment.