Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef8c0017 authored by Kalle Valo's avatar Kalle Valo
Browse files

ath: remove camel case from struct reg_dmn_pair_mapping 



Fixes a checkpatch warning in ath10k:

drivers/net/wireless/ath/ath10k/mac.c:1636: WARNING: Avoid CamelCase: <regpair->regDmnEnum>

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 2e05f01b

drivers/net/wireless/ath/ath.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ enum ath_bus_type { 
};



struct reg_dmn_pair_mapping {

	u16 regDmnEnum;

	u16 reg_domain;

	u16 reg_5ghz_ctl;

	u16 reg_2ghz_ctl;

};

drivers/net/wireless/ath/ath10k/mac.c

+3 −3
Original line number Diff line number Diff line
@@ -1648,9 +1648,9 @@ static void ath10k_regd_update(struct ath10k *ar) 
	/* Target allows setting up per-band regdomain but ath_common provides

	 * a combined one only */

	ret = ath10k_wmi_pdev_set_regdomain(ar,

					    regpair->regDmnEnum,

					    regpair->regDmnEnum, /* 2ghz */

					    regpair->regDmnEnum, /* 5ghz */

					    regpair->reg_domain,

					    regpair->reg_domain, /* 2ghz */

					    regpair->reg_domain, /* 5ghz */

					    regpair->reg_2ghz_ctl,

					    regpair->reg_5ghz_ctl);

	if (ret)

drivers/net/wireless/ath/ath6kl/wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ ath6kl_get_regpair(u16 regdmn) 
		return NULL;



	for (i = 0; i < ARRAY_SIZE(regDomainPairs); i++) {

		if (regDomainPairs[i].regDmnEnum == regdmn)

		if (regDomainPairs[i].reg_domain == regdmn)

			return &regDomainPairs[i];

	}
@@ -954,7 +954,7 @@ static void ath6kl_wmi_regdomain_event(struct wmi *wmi, u8 *datap, int len) 
		country = ath6kl_regd_find_country_by_rd((u16) reg_code);

		if (regpair)

			ath6kl_dbg(ATH6KL_DBG_WMI, "Regpair used: 0x%0x\n",

				   regpair->regDmnEnum);

				   regpair->reg_domain);

		else

			ath6kl_warn("Regpair not found reg_code 0x%0x\n",

				    reg_code);

drivers/net/wireless/ath/regd.c

+5 −5
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static const struct ieee80211_regdomain *ath_default_world_regdomain(void) 
static const struct

ieee80211_regdomain *ath_world_regdomain(struct ath_regulatory *reg)

{

	switch (reg->regpair->regDmnEnum) {

	switch (reg->regpair->reg_domain) {

	case 0x60:

	case 0x61:

	case 0x62:
@@ -431,7 +431,7 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy, 
				      enum nl80211_reg_initiator initiator,

				      struct ath_regulatory *reg)

{

	switch (reg->regpair->regDmnEnum) {

	switch (reg->regpair->reg_domain) {

	case 0x60:

	case 0x63:

	case 0x66:
@@ -560,7 +560,7 @@ static bool ath_regd_is_eeprom_valid(struct ath_regulatory *reg) 
			printk(KERN_DEBUG "ath: EEPROM indicates we "

			       "should expect a direct regpair map\n");

		for (i = 0; i < ARRAY_SIZE(regDomainPairs); i++)

			if (regDomainPairs[i].regDmnEnum == rd)

			if (regDomainPairs[i].reg_domain == rd)

				return true;

	}

	printk(KERN_DEBUG
@@ -617,7 +617,7 @@ ath_get_regpair(int regdmn) 
	if (regdmn == NO_ENUMRD)

		return NULL;

	for (i = 0; i < ARRAY_SIZE(regDomainPairs); i++) {

		if (regDomainPairs[i].regDmnEnum == regdmn)

		if (regDomainPairs[i].reg_domain == regdmn)

			return &regDomainPairs[i];

	}

	return NULL;
@@ -741,7 +741,7 @@ static int __ath_regd_init(struct ath_regulatory *reg) 
	printk(KERN_DEBUG "ath: Country alpha2 being used: %c%c\n",

		reg->alpha2[0], reg->alpha2[1]);

	printk(KERN_DEBUG "ath: Regpair used: 0x%0x\n",

		reg->regpair->regDmnEnum);

		reg->regpair->reg_domain);



	return 0;

}