diff options
| author | Noe Rubinstein <nrubinstein@proformatique.com> | 2010-11-26 17:37:31 +0100 |
|---|---|---|
| committer | Noe Rubinstein <nrubinstein@proformatique.com> | 2010-11-26 17:37:31 +0100 |
| commit | bb72e811ab26b8d98fc59515616e7e82ec206e24 (patch) | |
| tree | ddd5f39590d8fe87536137c588b04b5459d2453d | |
| parent | ce08d58d1bbcd5543acd8e2989e90adb12ac7192 (diff) | |
remove nonsense
| -rw-r--r-- | xhfc/xhfc.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/xhfc/xhfc.c b/xhfc/xhfc.c index 617375b..58e4b6d 100644 --- a/xhfc/xhfc.c +++ b/xhfc/xhfc.c @@ -372,12 +372,7 @@ static int hdlc_rx_frame(struct xhfc_span *xhfc_span) zleft++; do { - if (zleft > HDLC_BUF_LEN) - j = HDLC_BUF_LEN; - else - j = zleft; - - xhfc_selfifo(x, fifo, RECEIVE); + j = zleft > HDLC_BUF_LEN ? HDLC_BUF_LEN : zleft; for (i = 0; i < j; i++) buf[i] = read_xhfc(x, A_FIFO_DATA); @@ -404,9 +399,8 @@ static int hdlc_rx_frame(struct xhfc_span *xhfc_span) dbglen += sprintf(debugbuf+dbglen, "%02x ", buf[i]); debugbuf[dbglen] = '\0'; - xhfc_info(x, "hdlc_rx_frame(fifo %d): " - "zlen=%d, zleft=%d: %s\n", - fifo, zlen, zleft, debugbuf); + xhfc_info(x, "%s(fifo %d): zlen=%d, zleft=%d: %s\n", + __func__, fifo, zlen, zleft, debugbuf); } } while (zleft > 0); @@ -1027,7 +1021,6 @@ int __devinit xhfc_init_one(struct pci_dev *pdev, pi->xhfc.pi = pi; /* only adress one xhfc per PI */ - pi->xhfc.chipidx = 0; pi->xhfc.name = pi->name; /* init interrupt engine */ |