openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mt76x0: remove mt76x0_vendor_reset routine 

Remove mt76x0_vendor_reset duplicated routine and use mt76u_mcu_fw_reset
utility function for mcu fw reset

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Lorenzo Bianconi 2018-08-25 12:40:46 +02:00 committed by Kalle Valo
parent 795dbf0fd2
commit e9fa647a0a
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c
View File

@ -571,7 +571,7 @@ static int mt76x0_load_firmware(struct mt76x0_dev *dev)
mt76_set(dev, MT_USB_DMA_CFG, (MT_USB_DMA_CFG_RX_BULK_EN |
MT_USB_DMA_CFG_TX_BULK_EN) |
FIELD_PREP(MT_USB_DMA_CFG_RX_BULK_AGG_TOUT, 0x20));
mt76x0_vendor_reset(dev);
mt76u_mcu_fw_reset(&dev->mt76);
msleep(5);
/*
mt76x0_rmw(dev, MT_PBF_CFG, 0, (MT_PBF_CFG_TX0Q_EN |

6
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
View File

@ -131,12 +131,6 @@ int mt76x0_vendor_request(struct mt76x0_dev *dev, const u8 req,
return ret;
}
void mt76x0_vendor_reset(struct mt76x0_dev *dev)
{
mt76x0_vendor_request(dev, MT_VEND_DEV_MODE, USB_DIR_OUT,
MT_VEND_DEV_MODE_RESET, 0, NULL, 0);
}
int mt76x0_vendor_single_wr(struct mt76x0_dev *dev, const u8 req,
const u16 offset, const u32 val)
{

1
drivers/net/wireless/mediatek/mt76/mt76x0/usb.h
View File

@ -54,7 +54,6 @@ void mt76x0_complete_urb(struct urb *urb);
int mt76x0_vendor_request(struct mt76x0_dev *dev, const u8 req,
const u8 direction, const u16 val, const u16 offset,
void *buf, const size_t buflen);
void mt76x0_vendor_reset(struct mt76x0_dev *dev);
int mt76x0_vendor_single_wr(struct mt76x0_dev *dev, const u8 req,
const u16 offset, const u32 val);