Skip to content

Commit

Permalink
r8152: remove generic_ocp_read before writing
Browse files Browse the repository at this point in the history
For ocp_write_word() and ocp_write_byte(), there is a generic_ocp_read()
which is used to read the whole 4 byte data, keep the unchanged bytes,
and modify the expected bytes. However, the "byen" could be used to
determine which bytes of the 4 bytes to write, so the action could be
removed.

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 Jan 19, 2015
1 parent e60bf80 commit 8cb3db2
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/net/usb/r8152.c
Original file line number Diff line number Diff line change
Expand Up @@ -833,9 +833,6 @@ static void ocp_write_word(struct r8152 *tp, u16 type, u16 index, u32 data)
index &= ~3;
}

generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);

data |= __le32_to_cpu(tmp) & ~mask;
tmp = __cpu_to_le32(data);

generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type);
Expand Down Expand Up @@ -874,9 +871,6 @@ static void ocp_write_byte(struct r8152 *tp, u16 type, u16 index, u32 data)
index &= ~3;
}

generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);

data |= __le32_to_cpu(tmp) & ~mask;
tmp = __cpu_to_le32(data);

generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type);
Expand Down

0 comments on commit 8cb3db2

Please sign in to comment.