Commit 8f72e98e authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau

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

Compiler give us guarantees on variables alignment, so use
an variable as buffer when read/write registers and remove
unneeded {put,get}_unaligned.
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b229bf7d
...@@ -390,7 +390,10 @@ enum mt76u_out_ep { ...@@ -390,7 +390,10 @@ enum mt76u_out_ep {
#define MCU_RESP_URB_SIZE 1024 #define MCU_RESP_URB_SIZE 1024
struct mt76_usb { struct mt76_usb {
struct mutex usb_ctrl_mtx; struct mutex usb_ctrl_mtx;
u8 data[32]; union {
u8 data[32];
__le32 reg_val;
};
struct tasklet_struct rx_tasklet; struct tasklet_struct rx_tasklet;
struct delayed_work stat_work; struct delayed_work stat_work;
......
...@@ -95,9 +95,9 @@ static u32 __mt76u_rr(struct mt76_dev *dev, u32 addr) ...@@ -95,9 +95,9 @@ static u32 __mt76u_rr(struct mt76_dev *dev, u32 addr)
ret = __mt76u_vendor_request(dev, req, ret = __mt76u_vendor_request(dev, req,
USB_DIR_IN | USB_TYPE_VENDOR, USB_DIR_IN | USB_TYPE_VENDOR,
0, offset, usb->data, sizeof(__le32)); 0, offset, &usb->reg_val, sizeof(__le32));
if (ret == sizeof(__le32)) if (ret == sizeof(__le32))
data = get_unaligned_le32(usb->data); data = le32_to_cpu(usb->reg_val);
trace_usb_reg_rr(dev, addr, data); trace_usb_reg_rr(dev, addr, data);
return data; return data;
...@@ -131,10 +131,10 @@ static void __mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val) ...@@ -131,10 +131,10 @@ static void __mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val)
} }
offset = addr & ~MT_VEND_TYPE_MASK; offset = addr & ~MT_VEND_TYPE_MASK;
put_unaligned_le32(val, usb->data); usb->reg_val = cpu_to_le32(val);
__mt76u_vendor_request(dev, req, __mt76u_vendor_request(dev, req,
USB_DIR_OUT | USB_TYPE_VENDOR, 0, USB_DIR_OUT | USB_TYPE_VENDOR, 0,
offset, usb->data, sizeof(__le32)); offset, &usb->reg_val, sizeof(__le32));
trace_usb_reg_wr(dev, addr, val); trace_usb_reg_wr(dev, addr, val);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment