diff options
| -rw-r--r-- | drivers/net/can/flexcan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 944aa5d3af6e..630c7bf032a8 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c | |||
| @@ -298,7 +298,7 @@ static int flexcan_chip_enable(struct flexcan_priv *priv) | |||
| 298 | flexcan_write(reg, ®s->mcr); | 298 | flexcan_write(reg, ®s->mcr); |
| 299 | 299 | ||
| 300 | while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)) | 300 | while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)) |
| 301 | usleep_range(10, 20); | 301 | udelay(10); |
| 302 | 302 | ||
| 303 | if (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK) | 303 | if (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK) |
| 304 | return -ETIMEDOUT; | 304 | return -ETIMEDOUT; |
| @@ -317,7 +317,7 @@ static int flexcan_chip_disable(struct flexcan_priv *priv) | |||
| 317 | flexcan_write(reg, ®s->mcr); | 317 | flexcan_write(reg, ®s->mcr); |
| 318 | 318 | ||
| 319 | while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)) | 319 | while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)) |
| 320 | usleep_range(10, 20); | 320 | udelay(10); |
| 321 | 321 | ||
| 322 | if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)) | 322 | if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)) |
| 323 | return -ETIMEDOUT; | 323 | return -ETIMEDOUT; |
| @@ -336,7 +336,7 @@ static int flexcan_chip_freeze(struct flexcan_priv *priv) | |||
| 336 | flexcan_write(reg, ®s->mcr); | 336 | flexcan_write(reg, ®s->mcr); |
| 337 | 337 | ||
| 338 | while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)) | 338 | while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)) |
| 339 | usleep_range(100, 200); | 339 | udelay(100); |
| 340 | 340 | ||
| 341 | if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)) | 341 | if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)) |
| 342 | return -ETIMEDOUT; | 342 | return -ETIMEDOUT; |
| @@ -355,7 +355,7 @@ static int flexcan_chip_unfreeze(struct flexcan_priv *priv) | |||
| 355 | flexcan_write(reg, ®s->mcr); | 355 | flexcan_write(reg, ®s->mcr); |
| 356 | 356 | ||
| 357 | while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)) | 357 | while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)) |
| 358 | usleep_range(10, 20); | 358 | udelay(10); |
| 359 | 359 | ||
| 360 | if (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK) | 360 | if (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK) |
| 361 | return -ETIMEDOUT; | 361 | return -ETIMEDOUT; |
| @@ -370,7 +370,7 @@ static int flexcan_chip_softreset(struct flexcan_priv *priv) | |||
| 370 | 370 | ||
| 371 | flexcan_write(FLEXCAN_MCR_SOFTRST, ®s->mcr); | 371 | flexcan_write(FLEXCAN_MCR_SOFTRST, ®s->mcr); |
| 372 | while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST)) | 372 | while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST)) |
| 373 | usleep_range(10, 20); | 373 | udelay(10); |
| 374 | 374 | ||
| 375 | if (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST) | 375 | if (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST) |
| 376 | return -ETIMEDOUT; | 376 | return -ETIMEDOUT; |
