Revert "mt76: usb: remove unneeded {put,get}_unaligned"

This reverts commit f43b6228fa.
This commit is contained in:
Felix Fietkau
2019-07-12 15:52:02 +02:00
parent 3b08966d99
commit 48800e7b60
2 changed files with 5 additions and 8 deletions
+1 -4
View File
@@ -390,10 +390,7 @@ enum mt76u_out_ep {
#define MCU_RESP_URB_SIZE 1024
struct mt76_usb {
struct mutex usb_ctrl_mtx;
union {
u8 data[32];
__le32 reg_val;
};
u8 data[32];
struct tasklet_struct rx_tasklet;
struct delayed_work stat_work;
+4 -4
View File
@@ -95,9 +95,9 @@ static u32 __mt76u_rr(struct mt76_dev *dev, u32 addr)
ret = __mt76u_vendor_request(dev, req,
USB_DIR_IN | USB_TYPE_VENDOR,
0, offset, &usb->reg_val, sizeof(__le32));
0, offset, usb->data, sizeof(__le32));
if (ret == sizeof(__le32))
data = le32_to_cpu(usb->reg_val);
data = get_unaligned_le32(usb->data);
trace_usb_reg_rr(dev, addr, data);
return data;
@@ -131,10 +131,10 @@ static void __mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val)
}
offset = addr & ~MT_VEND_TYPE_MASK;
usb->reg_val = cpu_to_le32(val);
put_unaligned_le32(val, usb->data);
__mt76u_vendor_request(dev, req,
USB_DIR_OUT | USB_TYPE_VENDOR, 0,
offset, &usb->reg_val, sizeof(__le32));
offset, usb->data, sizeof(__le32));
trace_usb_reg_wr(dev, addr, val);
}