mt76usb: use usb_dev private data

Setup usb device private data. This allows to remove mt76u_buf->dev
and simplify some routines as no longer we need to get usb device
through usb interface.

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 0018131de20c8a0a46c180850a30c2ea3955da18..c495fbacb4b361c964ad815790fea72b83e83749 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -90,7 +90,6 @@ struct mt76_tx_info {
 };
 
 struct mt76u_buf {
-       struct mt76_dev *dev;
        struct urb *urb;
        size_t len;
        void *buf;
@@ -765,8 +764,7 @@ static inline int
 mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len,
               int timeout)
 {
-       struct usb_interface *intf = to_usb_interface(dev->dev);
-       struct usb_device *udev = interface_to_usbdev(intf);
+       struct usb_device *udev = to_usb_device(dev->dev);
        struct mt76_usb *usb = &dev->usb;
        unsigned int pipe;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 69d6328a098d43a0144df157f3428aa4d8bf0f3f..1ef00e971cfaffc9b3a299341d1b9bd56c915325 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -234,7 +234,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,
        u32 mac_rev;
        int ret;
 
-       mdev = mt76_alloc_device(&usb_intf->dev, sizeof(*dev), &mt76x0u_ops,
+       mdev = mt76_alloc_device(&usb_dev->dev, sizeof(*dev), &mt76x0u_ops,
                                 &drv_ops);
        if (!mdev)
                return -ENOMEM;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
index 8703a36a05571578e7cc92f97d7b3662e3080733..d08bb964966b108f19ae36b86a901d0afb4231bd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
@@ -49,7 +49,7 @@ static int mt76x2u_probe(struct usb_interface *intf,
        struct mt76_dev *mdev;
        int err;
 
-       mdev = mt76_alloc_device(&intf->dev, sizeof(*dev), &mt76x2u_ops,
+       mdev = mt76_alloc_device(&udev->dev, sizeof(*dev), &mt76x2u_ops,
                                 &drv_ops);
        if (!mdev)
                return -ENOMEM;
@@ -59,6 +59,8 @@ static int mt76x2u_probe(struct usb_interface *intf,
        udev = usb_get_dev(udev);
        usb_reset_device(udev);
 
+       usb_set_intfdata(intf, dev);
+
        mt76x02u_init_mcu(mdev);
        err = mt76u_init(mdev, intf);
        if (err < 0)

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 56e7a2ca89307d547e45a1518a086cae217a672a..28552c622feef7249b5eb10ce8a34e4b2932949a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -31,8 +31,7 @@ static int __mt76u_vendor_request(struct mt76_dev *dev, u8 req,
                                  u8 req_type, u16 val, u16 offset,
                                  void *buf, size_t len)
 {
-       struct usb_interface *intf = to_usb_interface(dev->dev);
-       struct usb_device *udev = interface_to_usbdev(intf);
+       struct usb_device *udev = to_usb_device(dev->dev);
        unsigned int pipe;
        int i, ret;
 
@@ -247,8 +246,7 @@ mt76u_rd_rp(struct mt76_dev *dev, u32 base,
 
 static bool mt76u_check_sg(struct mt76_dev *dev)
 {
-       struct usb_interface *intf = to_usb_interface(dev->dev);
-       struct usb_device *udev = interface_to_usbdev(intf);
+       struct usb_device *udev = to_usb_device(dev->dev);
 
        return (!disable_usb_sg && udev->bus->sg_tablesize > 0 &&
                (udev->bus->no_sg_constraint ||
@@ -341,7 +339,6 @@ mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf)
        struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
 
        buf->len = SKB_WITH_OVERHEAD(q->buf_size);
-       buf->dev = dev;
 
        buf->urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!buf->urb)
@@ -379,8 +376,7 @@ mt76u_fill_bulk_urb(struct mt76_dev *dev, int dir, int index,
                    struct mt76u_buf *buf, usb_complete_t complete_fn,
                    void *context)
 {
-       struct usb_interface *intf = to_usb_interface(dev->dev);
-       struct usb_device *udev = interface_to_usbdev(intf);
+       struct usb_device *udev = to_usb_device(dev->dev);
        u8 *data = buf->urb->num_sgs ? NULL : buf->buf;
        unsigned int pipe;
 
@@ -694,8 +690,8 @@ static void mt76u_tx_status_data(struct work_struct *work)
 
 static void mt76u_complete_tx(struct urb *urb)
 {
+       struct mt76_dev *dev = dev_get_drvdata(&urb->dev->dev);
        struct mt76u_buf *buf = urb->context;
-       struct mt76_dev *dev = buf->dev;
 
        if (mt76u_urb_error(urb))
                dev_err(dev->dev, "tx urb failed: %d\n", urb->status);
@@ -806,7 +802,6 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)
                q->ndesc = MT_NUM_TX_ENTRIES;
                for (j = 0; j < q->ndesc; j++) {
                        buf = &q->entry[j].ubuf;
-                       buf->dev = dev;
 
                        buf->urb = usb_alloc_urb(0, GFP_KERNEL);
                        if (!buf->urb)