mirror of https://gitee.com/openkylin/linux.git
mt76x0: remove has_{2,5}ghz fields of mt76x0_eeprom_params
Remove has_2ghz/has_5ghz fields of mt76x0_eeprom_params data structure and use mt76_dev ones. This is a preliminary patch to use shared routines for device allocation Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
6f15ed16f1
commit
540399d5fb
|
@ -123,18 +123,19 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom)
|
|||
|
||||
switch (FIELD_GET(MT_EE_NIC_CONF_0_BOARD_TYPE, nic_conf0)) {
|
||||
case BOARD_TYPE_5GHZ:
|
||||
dev->ee->has_5ghz = true;
|
||||
dev->mt76.cap.has_5ghz = true;
|
||||
break;
|
||||
case BOARD_TYPE_2GHZ:
|
||||
dev->ee->has_2ghz = true;
|
||||
dev->mt76.cap.has_2ghz = true;
|
||||
break;
|
||||
default:
|
||||
dev->ee->has_2ghz = true;
|
||||
dev->ee->has_5ghz = true;
|
||||
dev->mt76.cap.has_2ghz = true;
|
||||
dev->mt76.cap.has_5ghz = true;
|
||||
break;
|
||||
}
|
||||
|
||||
dev_dbg(dev->mt76.dev, "Has 2GHZ %d 5GHZ %d\n", dev->ee->has_2ghz, dev->ee->has_5ghz);
|
||||
dev_dbg(dev->mt76.dev, "Has 2GHZ %d 5GHZ %d\n",
|
||||
dev->mt76.cap.has_2ghz, dev->mt76.cap.has_5ghz);
|
||||
|
||||
if (!field_valid(nic_conf1 & 0xff))
|
||||
nic_conf1 &= 0xff00;
|
||||
|
|
|
@ -112,9 +112,6 @@ struct mt76x0_eeprom_params {
|
|||
u8 tx_pwr_per_chan[58];
|
||||
|
||||
struct reg_channel_bounds reg;
|
||||
|
||||
bool has_2ghz;
|
||||
bool has_5ghz;
|
||||
};
|
||||
|
||||
int mt76x0_eeprom_init(struct mt76x0_dev *dev);
|
||||
|
|
|
@ -662,13 +662,13 @@ int mt76x0_register_device(struct mt76x0_dev *dev)
|
|||
wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR;
|
||||
wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
|
||||
|
||||
if (dev->ee->has_2ghz) {
|
||||
if (dev->mt76.cap.has_2ghz) {
|
||||
ret = mt76_init_sband_2g(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (dev->ee->has_5ghz) {
|
||||
if (dev->mt76.cap.has_5ghz) {
|
||||
ret = mt76_init_sband_5g(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
Loading…
Reference in New Issue