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: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 989386e..44299e7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -390,7 +390,10 @@ enum mt76u_out_ep {
 #define MCU_RESP_URB_SIZE      1024
 struct mt76_usb {
        struct mutex usb_ctrl_mtx;
-       u8 data[32];
+       union {
+               u8 data[32];
+               __le32 reg_val;
+       };
 
        struct tasklet_struct rx_tasklet;
        struct delayed_work stat_work;

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index f19bd60..9b8fbf4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -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->data, sizeof(__le32));
+                                    0, offset, &usb->reg_val, 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);
 
        return data;
@@ -131,10 +131,10 @@ static void __mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val)
        }
        offset = addr & ~MT_VEND_TYPE_MASK;
 
-       put_unaligned_le32(val, usb->data);
+       usb->reg_val = cpu_to_le32(val);
        __mt76u_vendor_request(dev, req,
                               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);
 }