Commit 61c51a74 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: use mt76_dev in mt76_is_{mmio,usb} 



Convert mt76_is_mmio and mt76_is_usb to rely on mt76_dev instead of
mt76x02_dev since this is a property not strictly related to hw chipset
and it will be more reusable

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent cc53b52d

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

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ struct mt76_bus_ops { 
	enum mt76_bus_type type;

};



#define mt76_is_usb(dev) ((dev)->mt76.bus->type == MT76_BUS_USB)

#define mt76_is_mmio(dev) ((dev)->mt76.bus->type == MT76_BUS_MMIO)

#define mt76_is_usb(dev) ((dev)->bus->type == MT76_BUS_USB)

#define mt76_is_mmio(dev) ((dev)->bus->type == MT76_BUS_MMIO)



enum mt76_txq_id {

	MT_TXQ_VO = IEEE80211_AC_VO,

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

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) 
{

	cancel_delayed_work_sync(&dev->cal_work);

	mt76x02_pre_tbtt_enable(dev, false);

	if (mt76_is_mmio(dev))

	if (mt76_is_mmio(&dev->mt76))

		tasklet_disable(&dev->dfs_pd.dfs_tasklet);



	mt76_set_channel(&dev->mt76);
@@ -22,7 +22,7 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) 
	mt76x02_mac_cc_reset(dev);

	mt76x02_edcca_init(dev);



	if (mt76_is_mmio(dev)) {

	if (mt76_is_mmio(&dev->mt76)) {

		mt76x02_dfs_init_params(dev);

		tasklet_enable(&dev->dfs_pd.dfs_tasklet);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


static inline bool is_mt7610e(struct mt76x02_dev *dev)

{

	if (!mt76_is_mmio(dev))

	if (!mt76_is_mmio(&dev->mt76))

		return false;



	return mt76_chip(&dev->mt76) == 0x7610;

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

+6 −6
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ out: 
static int

mt76x0_rf_wr(struct mt76x02_dev *dev, u32 offset, u8 val)

{

	if (mt76_is_usb(dev)) {

	if (mt76_is_usb(&dev->mt76)) {

		struct mt76_reg_pair pair = {

			.reg = offset,

			.value = val,
@@ -121,7 +121,7 @@ static int mt76x0_rf_rr(struct mt76x02_dev *dev, u32 offset) 
	int ret;

	u32 val;



	if (mt76_is_usb(dev)) {

	if (mt76_is_usb(&dev->mt76)) {

		struct mt76_reg_pair pair = {

			.reg = offset,

		};
@@ -176,7 +176,7 @@ mt76x0_phy_rf_csr_wr_rp(struct mt76x02_dev *dev, 
}



#define RF_RANDOM_WRITE(dev, tab) do {					\

	if (mt76_is_mmio(dev))						\

	if (mt76_is_mmio(&dev->mt76))					\

		mt76x0_phy_rf_csr_wr_rp(dev, tab, ARRAY_SIZE(tab));	\

	else								\

		mt76_wr_rp(dev, MT_MCU_MEMMAP_RF, tab, ARRAY_SIZE(tab));\
@@ -744,7 +744,7 @@ mt76x0_phy_get_delta_power(struct mt76x02_dev *dev, u8 tx_mode, 


	if (!tx_mode) {

		data = mt76_rr(dev, MT_BBP(CORE, 1));

		if (is_mt7630(dev) && mt76_is_mmio(dev)) {

		if (is_mt7630(dev) && mt76_is_mmio(&dev->mt76)) {

			int offset;



			/* 2.3 * 8192 or 1.5 * 8192 */
@@ -966,7 +966,7 @@ void mt76x0_phy_set_channel(struct mt76x02_dev *dev, 
		break;

	}



	if (mt76_is_usb(dev)) {

	if (mt76_is_usb(&dev->mt76)) {

		mt76x0_phy_bbp_set_bw(dev, chandef->width);

	} else {

		if (chandef->width == NL80211_CHAN_WIDTH_80 ||
@@ -1122,7 +1122,7 @@ static void mt76x0_rf_patch_reg_array(struct mt76x02_dev *dev, 


		switch (reg) {

		case MT_RF(0, 3):

			if (mt76_is_mmio(dev)) {

			if (mt76_is_mmio(&dev->mt76)) {

				if (is_mt7630(dev))

					val = 0x70;

				else

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

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int mt76x02_mcu_calibrate(struct mt76x02_dev *dev, int type, u32 param) 
		.id = cpu_to_le32(type),

		.value = cpu_to_le32(param),

	};

	bool is_mt76x2e = mt76_is_mmio(dev) && is_mt76x2(dev);

	bool is_mt76x2e = mt76_is_mmio(&dev->mt76) && is_mt76x2(dev);

	int ret;



	if (is_mt76x2e)

CRA Git | Maintained and supported by SUSTech CRA and CCSE