aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/cyclades.c12
-rw-r--r--include/linux/cyclades.h2
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 14652c1ed024..ab9ad66ceefa 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -1049,7 +1049,6 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
1049 channel = (u_short) (save_xir & CyIRChannel); 1049 channel = (u_short) (save_xir & CyIRChannel);
1050 i = channel + chip * 4 + cinfo->first_line; 1050 i = channel + chip * 4 + cinfo->first_line;
1051 info = &cy_port[i]; 1051 info = &cy_port[i];
1052 info->last_active = jiffies;
1053 save_car = readb(base_addr + (CyCAR << index)); 1052 save_car = readb(base_addr + (CyCAR << index));
1054 cy_writeb(base_addr + (CyCAR << index), save_xir); 1053 cy_writeb(base_addr + (CyCAR << index), save_xir);
1055 1054
@@ -1225,7 +1224,6 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
1225 goto txend; 1224 goto txend;
1226 } 1225 }
1227 info = &cy_port[i]; 1226 info = &cy_port[i];
1228 info->last_active = jiffies;
1229 if (info->tty == 0) { 1227 if (info->tty == 0) {
1230 cy_writeb(base_addr + (CySRER << index), 1228 cy_writeb(base_addr + (CySRER << index),
1231 readb(base_addr + (CySRER << index)) & 1229 readb(base_addr + (CySRER << index)) &
@@ -1339,7 +1337,6 @@ txend:
1339 save_xir = (u_char) readb(base_addr + (CyMIR << index)); 1337 save_xir = (u_char) readb(base_addr + (CyMIR << index));
1340 channel = (u_short) (save_xir & CyIRChannel); 1338 channel = (u_short) (save_xir & CyIRChannel);
1341 info = &cy_port[channel + chip * 4 + cinfo->first_line]; 1339 info = &cy_port[channel + chip * 4 + cinfo->first_line];
1342 info->last_active = jiffies;
1343 save_car = readb(base_addr + (CyCAR << index)); 1340 save_car = readb(base_addr + (CyCAR << index));
1344 cy_writeb(base_addr + (CyCAR << index), save_xir); 1341 cy_writeb(base_addr + (CyCAR << index), save_xir);
1345 1342
@@ -1570,9 +1567,6 @@ cyz_handle_rx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
1570 char_count = rx_put - rx_get + rx_bufsize; 1567 char_count = rx_put - rx_get + rx_bufsize;
1571 1568
1572 if (char_count) { 1569 if (char_count) {
1573 info->last_active = jiffies;
1574 info->jiffies[1] = jiffies;
1575
1576#ifdef CY_ENABLE_MONITORING 1570#ifdef CY_ENABLE_MONITORING
1577 info->mon.int_count++; 1571 info->mon.int_count++;
1578 info->mon.char_count += char_count; 1572 info->mon.char_count += char_count;
@@ -1678,8 +1672,6 @@ cyz_handle_tx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
1678 info->x_char = 0; 1672 info->x_char = 0;
1679 char_count--; 1673 char_count--;
1680 info->icount.tx++; 1674 info->icount.tx++;
1681 info->last_active = jiffies;
1682 info->jiffies[2] = jiffies;
1683 } 1675 }
1684#ifdef BLOCKMOVE 1676#ifdef BLOCKMOVE
1685 while (0 < (small_count = min_t(unsigned int, 1677 while (0 < (small_count = min_t(unsigned int,
@@ -1699,8 +1691,6 @@ cyz_handle_tx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
1699 info->xmit_cnt -= small_count; 1691 info->xmit_cnt -= small_count;
1700 info->xmit_tail = (info->xmit_tail + small_count) & 1692 info->xmit_tail = (info->xmit_tail + small_count) &
1701 (SERIAL_XMIT_SIZE - 1); 1693 (SERIAL_XMIT_SIZE - 1);
1702 info->last_active = jiffies;
1703 info->jiffies[2] = jiffies;
1704 } 1694 }
1705#else 1695#else
1706 while (info->xmit_cnt && char_count) { 1696 while (info->xmit_cnt && char_count) {
@@ -1713,8 +1703,6 @@ cyz_handle_tx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
1713 tx_put = (tx_put + 1) & (tx_bufsize - 1); 1703 tx_put = (tx_put + 1) & (tx_bufsize - 1);
1714 char_count--; 1704 char_count--;
1715 info->icount.tx++; 1705 info->icount.tx++;
1716 info->last_active = jiffies;
1717 info->jiffies[2] = jiffies;
1718 } 1706 }
1719#endif 1707#endif
1720ztxdone: 1708ztxdone:
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index cdd77398030c..07791f026766 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -569,7 +569,6 @@ struct cyclades_port {
569 int close_delay; 569 int close_delay;
570 unsigned short closing_wait; 570 unsigned short closing_wait;
571 unsigned long event; 571 unsigned long event;
572 unsigned long last_active;
573 int count; /* # of fd on device */ 572 int count; /* # of fd on device */
574 int breakon; 573 int breakon;
575 int breakoff; 574 int breakoff;
@@ -580,7 +579,6 @@ struct cyclades_port {
580 int xmit_cnt; 579 int xmit_cnt;
581 int default_threshold; 580 int default_threshold;
582 int default_timeout; 581 int default_timeout;
583 unsigned long jiffies[3];
584 unsigned long rflush_count; 582 unsigned long rflush_count;
585 struct cyclades_monitor mon; 583 struct cyclades_monitor mon;
586 struct cyclades_idle_stats idle_stats; 584 struct cyclades_idle_stats idle_stats;