diff options
| author |   hayeswang <hayeswang@realtek.com> | 2015-01-19 17:02:45 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-01-19 16:16:32 -0500 |
| commit | 8cb3db24c80958647f8a1b65e4968f9f043ffc3d (patch) | |
| tree | 84bd4a3d997d2b431c1ef0fd15a81a4eef1a499b /drivers/net/usb | |
| parent | Merge branch 'bgmac' (diff) | |
| download | linux-dev-8cb3db24c80958647f8a1b65e4968f9f043ffc3d.tar.xz linux-dev-8cb3db24c80958647f8a1b65e4968f9f043ffc3d.zip | |
r8152: remove generic_ocp_read before writing
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>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 57ec23e8ccfa..0aa83fb4838d 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -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); @@ -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); |