Commit 80df01f4 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt76u: rely on usb_interface instead of usb_dev 



usb drivers are supposed to communicate using usb_interface instead
mt76x{0,2}u is now registering through usb_device. Fix it by passing
usb_intf device to mt76_alloc_device routine.

Fixes: 112f980a ("mt76usb: use usb_dev private data")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Tested-By: default avatarZero_Chaos <sidhayn@gmail.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5d1ad7d7

drivers/net/wireless/mediatek/mt76/mt76.h

+2 −1
Original line number Diff line number Diff line
@@ -804,7 +804,8 @@ static inline int 
mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len,

	       int timeout)

{

	struct usb_device *udev = to_usb_device(dev->dev);

	struct usb_interface *uintf = to_usb_interface(dev->dev);

	struct usb_device *udev = interface_to_usbdev(uintf);

	struct mt76_usb *usb = &dev->usb;

	unsigned int pipe;

drivers/net/wireless/mediatek/mt76/mt76x0/usb.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, 
	u32 mac_rev;

	int ret;



	mdev = mt76_alloc_device(&usb_dev->dev, sizeof(*dev), &mt76x0u_ops,

	mdev = mt76_alloc_device(&usb_intf->dev, sizeof(*dev), &mt76x0u_ops,

				 &drv_ops);

	if (!mdev)

		return -ENOMEM;

drivers/net/wireless/mediatek/mt76/mt76x2/usb.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int mt76x2u_probe(struct usb_interface *intf, 
	struct mt76_dev *mdev;

	int err;



	mdev = mt76_alloc_device(&udev->dev, sizeof(*dev), &mt76x2u_ops,

	mdev = mt76_alloc_device(&intf->dev, sizeof(*dev), &mt76x2u_ops,

				 &drv_ops);

	if (!mdev)

		return -ENOMEM;

drivers/net/wireless/mediatek/mt76/usb.c

+9 −3
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 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_device *udev = to_usb_device(dev->dev);

	struct usb_interface *uintf = to_usb_interface(dev->dev);

	struct usb_device *udev = interface_to_usbdev(uintf);

	unsigned int pipe;

	int i, ret;
@@ -234,7 +235,8 @@ mt76u_rd_rp(struct mt76_dev *dev, u32 base, 


static bool mt76u_check_sg(struct mt76_dev *dev)

{

	struct usb_device *udev = to_usb_device(dev->dev);

	struct usb_interface *uintf = to_usb_interface(dev->dev);

	struct usb_device *udev = interface_to_usbdev(uintf);



	return (!disable_usb_sg && udev->bus->sg_tablesize > 0 &&

		(udev->bus->no_sg_constraint ||
@@ -369,7 +371,8 @@ mt76u_fill_bulk_urb(struct mt76_dev *dev, int dir, int index, 
		    struct urb *urb, usb_complete_t complete_fn,

		    void *context)

{

	struct usb_device *udev = to_usb_device(dev->dev);

	struct usb_interface *uintf = to_usb_interface(dev->dev);

	struct usb_device *udev = interface_to_usbdev(uintf);

	unsigned int pipe;



	if (dir == USB_DIR_IN)
@@ -951,6 +954,7 @@ int mt76u_init(struct mt76_dev *dev, 
		.rd_rp = mt76u_rd_rp,

		.type = MT76_BUS_USB,

	};

	struct usb_device *udev = interface_to_usbdev(intf);

	struct mt76_usb *usb = &dev->usb;



	tasklet_init(&usb->rx_tasklet, mt76u_rx_tasklet, (unsigned long)dev);
@@ -964,6 +968,8 @@ int mt76u_init(struct mt76_dev *dev, 
	dev->bus = &mt76u_ops;

	dev->queue_ops = &usb_queue_ops;



	dev_set_drvdata(&udev->dev, dev);



	usb->sg_en = mt76u_check_sg(dev);



	return mt76u_set_endpoints(intf, usb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE