Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0753455322a957e6a8fd8a9db163ba5aec92ce76

Authored by Karl Hiramoto
Committed by David S. Miller
1 parent c69fb76e8f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

atm/idt77105.c: call atm_dev_signal_change() when signal changes. 

Propagate changes to upper atm layer.

Signed-off-by: Karl Hiramoto <karl@hiramoto.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 6 additions and 5 deletions Side-by-side Diff

drivers/atm/idt77105.c
Diff comments   View file @ 0753455
... ... @@ -126,7 +126,7 @@
126 126 istat = GET(ISTAT); /* side effect: clears all interrupt status bits */
127 127 if (istat & IDT77105_ISTAT_GOODSIG) {
128 128 /* Found signal again */
129   - dev->signal = ATM_PHY_SIG_FOUND;
  129 + atm_dev_signal_change(dev, ATM_PHY_SIG_FOUND);
130 130 printk(KERN_NOTICE "%s(itf %d): signal detected again\n",
131 131 dev->type,dev->number);
132 132 /* flush the receive FIFO */
... ... @@ -222,7 +222,7 @@
222 222 /* Rx Signal Condition Change - line went up or down */
223 223 if (istat & IDT77105_ISTAT_GOODSIG) { /* signal detected again */
224 224 /* This should not happen (restart timer does it) but JIC */
225   - dev->signal = ATM_PHY_SIG_FOUND;
  225 + atm_dev_signal_change(dev, ATM_PHY_SIG_FOUND);
226 226 } else { /* signal lost */
227 227 /*
228 228 * Disable interrupts and stop all transmission and
... ... @@ -235,7 +235,7 @@
235 235 IDT77105_MCR_DRIC|
236 236 IDT77105_MCR_HALTTX
237 237 ) & ~IDT77105_MCR_EIP, MCR);
238   - dev->signal = ATM_PHY_SIG_LOST;
  238 + atm_dev_signal_change(dev, ATM_PHY_SIG_LOST);
239 239 printk(KERN_NOTICE "%s(itf %d): signal lost\n",
240 240 dev->type,dev->number);
241 241 }
... ... @@ -272,8 +272,9 @@
272 272 memset(&PRIV(dev)->stats,0,sizeof(struct idt77105_stats));
273 273  
274 274 /* initialise dev->signal from Good Signal Bit */
275   - dev->signal = GET(ISTAT) & IDT77105_ISTAT_GOODSIG ? ATM_PHY_SIG_FOUND :
276   - ATM_PHY_SIG_LOST;
  275 + atm_dev_signal_change(dev,
  276 + GET(ISTAT) & IDT77105_ISTAT_GOODSIG ?
  277 + ATM_PHY_SIG_FOUND : ATM_PHY_SIG_LOST);
277 278 if (dev->signal == ATM_PHY_SIG_LOST)
278 279 printk(KERN_WARNING "%s(itf %d): no signal\n",dev->type,
279 280 dev->number);