Commit 2e66190e authored by Karthikeyan Periyasamy's avatar Karthikeyan Periyasamy Committed by Kalle Valo
Browse files

wifi: ath11k: rename the sc naming convention to ab 



In PCI, thermal and HAL interface layer module, the identifier
sc is used to represent an instance of ath11k_base structure.
However, within ath11k, the convention is to use "ab" to
represent an SoC "base" struct. So change the all instances
of sc to ab.

Compile tested only.

Signed-off-by: default avatarKarthikeyan Periyasamy <quic_periyasa@quicinc.com>
Acked-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231014032650.32605-3-quic_periyasa@quicinc.com
parent 265c038a

drivers/net/wireless/ath/ath11k/hif.h

+27 −27
Original line number Diff line number Diff line
@@ -9,18 +9,18 @@ 
#include "core.h"



struct ath11k_hif_ops {

	u32 (*read32)(struct ath11k_base *sc, u32 address);

	void (*write32)(struct ath11k_base *sc, u32 address, u32 data);

	u32 (*read32)(struct ath11k_base *ab, u32 address);

	void (*write32)(struct ath11k_base *ab, u32 address, u32 data);

	int (*read)(struct ath11k_base *ab, void *buf, u32 start, u32 end);

	void (*irq_enable)(struct ath11k_base *sc);

	void (*irq_disable)(struct ath11k_base *sc);

	int (*start)(struct ath11k_base *sc);

	void (*stop)(struct ath11k_base *sc);

	int (*power_up)(struct ath11k_base *sc);

	void (*power_down)(struct ath11k_base *sc);

	void (*irq_enable)(struct ath11k_base *ab);

	void (*irq_disable)(struct ath11k_base *ab);

	int (*start)(struct ath11k_base *ab);

	void (*stop)(struct ath11k_base *ab);

	int (*power_up)(struct ath11k_base *ab);

	void (*power_down)(struct ath11k_base *ab);

	int (*suspend)(struct ath11k_base *ab);

	int (*resume)(struct ath11k_base *ab);

	int (*map_service_to_pipe)(struct ath11k_base *sc, u16 service_id,

	int (*map_service_to_pipe)(struct ath11k_base *ab, u16 service_id,

				   u8 *ul_pipe, u8 *dl_pipe);

	int (*get_user_msi_vector)(struct ath11k_base *ab, char *user_name,

				   int *num_vectors, u32 *user_base_data,
@@ -44,34 +44,34 @@ static inline void ath11k_hif_ce_irq_disable(struct ath11k_base *ab) 
		ab->hif.ops->ce_irq_disable(ab);

}



static inline int ath11k_hif_start(struct ath11k_base *sc)

static inline int ath11k_hif_start(struct ath11k_base *ab)

{

	return sc->hif.ops->start(sc);

	return ab->hif.ops->start(ab);

}



static inline void ath11k_hif_stop(struct ath11k_base *sc)

static inline void ath11k_hif_stop(struct ath11k_base *ab)

{

	sc->hif.ops->stop(sc);

	ab->hif.ops->stop(ab);

}



static inline void ath11k_hif_irq_enable(struct ath11k_base *sc)

static inline void ath11k_hif_irq_enable(struct ath11k_base *ab)

{

	sc->hif.ops->irq_enable(sc);

	ab->hif.ops->irq_enable(ab);

}



static inline void ath11k_hif_irq_disable(struct ath11k_base *sc)

static inline void ath11k_hif_irq_disable(struct ath11k_base *ab)

{

	sc->hif.ops->irq_disable(sc);

	ab->hif.ops->irq_disable(ab);

}



static inline int ath11k_hif_power_up(struct ath11k_base *sc)

static inline int ath11k_hif_power_up(struct ath11k_base *ab)

{

	return sc->hif.ops->power_up(sc);

	return ab->hif.ops->power_up(ab);

}



static inline void ath11k_hif_power_down(struct ath11k_base *sc)

static inline void ath11k_hif_power_down(struct ath11k_base *ab)

{

	sc->hif.ops->power_down(sc);

	ab->hif.ops->power_down(ab);

}



static inline int ath11k_hif_suspend(struct ath11k_base *ab)
@@ -90,14 +90,14 @@ static inline int ath11k_hif_resume(struct ath11k_base *ab) 
	return 0;

}



static inline u32 ath11k_hif_read32(struct ath11k_base *sc, u32 address)

static inline u32 ath11k_hif_read32(struct ath11k_base *ab, u32 address)

{

	return sc->hif.ops->read32(sc, address);

	return ab->hif.ops->read32(ab, address);

}



static inline void ath11k_hif_write32(struct ath11k_base *sc, u32 address, u32 data)

static inline void ath11k_hif_write32(struct ath11k_base *ab, u32 address, u32 data)

{

	sc->hif.ops->write32(sc, address, data);

	ab->hif.ops->write32(ab, address, data);

}



static inline int ath11k_hif_read(struct ath11k_base *ab, void *buf,
@@ -109,10 +109,10 @@ static inline int ath11k_hif_read(struct ath11k_base *ab, void *buf, 
	return ab->hif.ops->read(ab, buf, start, end);

}



static inline int ath11k_hif_map_service_to_pipe(struct ath11k_base *sc, u16 service_id,

static inline int ath11k_hif_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,

						 u8 *ul_pipe, u8 *dl_pipe)

{

	return sc->hif.ops->map_service_to_pipe(sc, service_id, ul_pipe, dl_pipe);

	return ab->hif.ops->map_service_to_pipe(ab, service_id, ul_pipe, dl_pipe);

}



static inline int ath11k_get_user_msi_vector(struct ath11k_base *ab, char *user_name,

drivers/net/wireless/ath/ath11k/pcic.c

+3 −3
Original line number Diff line number Diff line
@@ -422,14 +422,14 @@ static void ath11k_pcic_ext_grp_disable(struct ath11k_ext_irq_grp *irq_grp) 
		disable_irq_nosync(irq_grp->ab->irq_num[irq_grp->irqs[i]]);

}



static void __ath11k_pcic_ext_irq_disable(struct ath11k_base *sc)

static void __ath11k_pcic_ext_irq_disable(struct ath11k_base *ab)

{

	int i;



	clear_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, &sc->dev_flags);

	clear_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, &ab->dev_flags);



	for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {

		struct ath11k_ext_irq_grp *irq_grp = &sc->ext_irq_grp[i];

		struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];



		ath11k_pcic_ext_grp_disable(irq_grp);

drivers/net/wireless/ath/ath11k/thermal.c

+11 −11
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ ATTRIBUTE_GROUPS(ath11k_hwmon); 


int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state)

{

	struct ath11k_base *sc = ar->ab;

	struct ath11k_base *ab = ar->ab;

	struct thermal_mitigation_params param;

	int ret = 0;
@@ -147,14 +147,14 @@ int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state) 


	ret = ath11k_wmi_send_thermal_mitigation_param_cmd(ar, &param);

	if (ret) {

		ath11k_warn(sc, "failed to send thermal mitigation duty cycle %u ret %d\n",

		ath11k_warn(ab, "failed to send thermal mitigation duty cycle %u ret %d\n",

			    throttle_state, ret);

	}



	return ret;

}



int ath11k_thermal_register(struct ath11k_base *sc)

int ath11k_thermal_register(struct ath11k_base *ab)

{

	struct thermal_cooling_device *cdev;

	struct device *hwmon_dev;
@@ -162,8 +162,8 @@ int ath11k_thermal_register(struct ath11k_base *sc) 
	struct ath11k_pdev *pdev;

	int i, ret;



	for (i = 0; i < sc->num_radios; i++) {

		pdev = &sc->pdevs[i];

	for (i = 0; i < ab->num_radios; i++) {

		pdev = &ab->pdevs[i];

		ar = pdev->ar;

		if (!ar)

			continue;
@@ -172,7 +172,7 @@ int ath11k_thermal_register(struct ath11k_base *sc) 
						       &ath11k_thermal_ops);



		if (IS_ERR(cdev)) {

			ath11k_err(sc, "failed to setup thermal device result: %ld\n",

			ath11k_err(ab, "failed to setup thermal device result: %ld\n",

				   PTR_ERR(cdev));

			ret = -EINVAL;

			goto err_thermal_destroy;
@@ -183,7 +183,7 @@ int ath11k_thermal_register(struct ath11k_base *sc) 
		ret = sysfs_create_link(&ar->hw->wiphy->dev.kobj, &cdev->device.kobj,

					"cooling_device");

		if (ret) {

			ath11k_err(sc, "failed to create cooling device symlink\n");

			ath11k_err(ab, "failed to create cooling device symlink\n");

			goto err_thermal_destroy;

		}
@@ -204,18 +204,18 @@ int ath11k_thermal_register(struct ath11k_base *sc) 
	return 0;



err_thermal_destroy:

	ath11k_thermal_unregister(sc);

	ath11k_thermal_unregister(ab);

	return ret;

}



void ath11k_thermal_unregister(struct ath11k_base *sc)

void ath11k_thermal_unregister(struct ath11k_base *ab)

{

	struct ath11k *ar;

	struct ath11k_pdev *pdev;

	int i;



	for (i = 0; i < sc->num_radios; i++) {

		pdev = &sc->pdevs[i];

	for (i = 0; i < ab->num_radios; i++) {

		pdev = &ab->pdevs[i];

		ar = pdev->ar;

		if (!ar)

			continue;

drivers/net/wireless/ath/ath11k/thermal.h

+4 −4
Original line number Diff line number Diff line
@@ -26,17 +26,17 @@ struct ath11k_thermal { 
};



#if IS_REACHABLE(CONFIG_THERMAL)

int ath11k_thermal_register(struct ath11k_base *sc);

void ath11k_thermal_unregister(struct ath11k_base *sc);

int ath11k_thermal_register(struct ath11k_base *ab);

void ath11k_thermal_unregister(struct ath11k_base *ab);

int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state);

void ath11k_thermal_event_temperature(struct ath11k *ar, int temperature);

#else

static inline int ath11k_thermal_register(struct ath11k_base *sc)

static inline int ath11k_thermal_register(struct ath11k_base *ab)

{

	return 0;

}



static inline void ath11k_thermal_unregister(struct ath11k_base *sc)

static inline void ath11k_thermal_unregister(struct ath11k_base *ab)

{

}