Skip to content

Commit

Permalink
r8152: use usleep_range
Browse files Browse the repository at this point in the history 
Replace mdelay with usleep_range to avoid busy loop.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
hayeswang authored and David S. Miller committed Sep 10, 2014
1 parent 67cc0d4 commit 8ddfa07
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions drivers/net/usb/r8152.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2051,13 +2051,13 @@ static void rtl8152_disable(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if ((ocp_data & FIFO_EMPTY) == FIFO_EMPTY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

for (i = 0; i < 1000; i++) {
if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0) & TCR0_TX_EMPTY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

for (i = 0; i < RTL8152_MAX_RX; i++)
Expand Down Expand Up @@ -2202,7 +2202,7 @@ static void rtl_clear_bp(struct r8152 *tp)
ocp_write_dword(tp, MCU_TYPE_USB, USB_BP_2, 0);
ocp_write_dword(tp, MCU_TYPE_USB, USB_BP_4, 0);
ocp_write_dword(tp, MCU_TYPE_USB, USB_BP_6, 0);
mdelay(3);
usleep_range(3000, 6000);
ocp_write_word(tp, MCU_TYPE_PLA, PLA_BP_BA, 0);
ocp_write_word(tp, MCU_TYPE_USB, USB_BP_BA, 0);
}
Expand Down Expand Up @@ -2288,7 +2288,7 @@ static void r8152b_exit_oob(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
Expand All @@ -2299,7 +2299,7 @@ static void r8152b_exit_oob(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

rtl8152_nic_reset(tp);
Expand Down Expand Up @@ -2360,7 +2360,7 @@ static void r8152b_enter_oob(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
Expand All @@ -2371,7 +2371,7 @@ static void r8152b_enter_oob(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
Expand Down Expand Up @@ -2518,7 +2518,7 @@ static void r8153_first_init(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
Expand All @@ -2529,7 +2529,7 @@ static void r8153_first_init(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
Expand Down Expand Up @@ -2573,7 +2573,7 @@ static void r8153_enter_oob(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
Expand All @@ -2584,7 +2584,7 @@ static void r8153_enter_oob(struct r8152 *tp)
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
usleep_range(1000, 2000);
}

ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8153_RMS);
Expand Down

0 comments on commit 8ddfa07

Please sign in to comment.