Commit 96c64857 authored by Kalle Valo's avatar Kalle Valo
Browse files

ath10k: hif: make send_complete_check op optional 



That way we don't need to have an empty function in sdio.c.

No functional changes, compile tested only.

Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1587037859-28873-5-git-send-email-kvalo@codeaurora.org
parent 58921763

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

+2 −1
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static inline void ath10k_hif_get_default_pipe(struct ath10k *ar, 
static inline void ath10k_hif_send_complete_check(struct ath10k *ar,

						  u8 pipe_id, int force)

{

	if (ar->hif.ops->send_complete_check)

		ar->hif.ops->send_complete_check(ar, pipe_id, force);

}

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

+0 −12
Original line number Diff line number Diff line
@@ -2101,17 +2101,6 @@ static void ath10k_sdio_hif_get_default_pipe(struct ath10k *ar, 
	*dl_pipe = 0;

}



/* This op is currently only used by htc_wait_target if the HTC ready

 * message times out. It is not applicable for SDIO since there is nothing

 * we can do if the HTC ready message does not arrive in time.

 * TODO: Make this op non mandatory by introducing a NULL check in the

 * hif op wrapper.

 */

static void ath10k_sdio_hif_send_complete_check(struct ath10k *ar,

						u8 pipe, int force)

{

}



static const struct ath10k_hif_ops ath10k_sdio_hif_ops = {

	.tx_sg			= ath10k_sdio_hif_tx_sg,

	.diag_read		= ath10k_sdio_hif_diag_read,
@@ -2123,7 +2112,6 @@ static const struct ath10k_hif_ops ath10k_sdio_hif_ops = { 
	.get_htt_tx_complete	= ath10k_sdio_get_htt_tx_complete,

	.map_service_to_pipe	= ath10k_sdio_hif_map_service_to_pipe,

	.get_default_pipe	= ath10k_sdio_hif_get_default_pipe,

	.send_complete_check	= ath10k_sdio_hif_send_complete_check,

	.power_up		= ath10k_sdio_hif_power_up,

	.power_down		= ath10k_sdio_hif_power_down,

#ifdef CONFIG_PM

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

+0 −12
Original line number Diff line number Diff line
@@ -693,17 +693,6 @@ static int ath10k_usb_hif_map_service_to_pipe(struct ath10k *ar, u16 svc_id, 
	return 0;

}



/* This op is currently only used by htc_wait_target if the HTC ready

 * message times out. It is not applicable for USB since there is nothing

 * we can do if the HTC ready message does not arrive in time.

 * TODO: Make this op non mandatory by introducing a NULL check in the

 * hif op wrapper.

 */

static void ath10k_usb_hif_send_complete_check(struct ath10k *ar,

					       u8 pipe, int force)

{

}



static int ath10k_usb_hif_power_up(struct ath10k *ar,

				   enum ath10k_firmware_mode fw_mode)

{
@@ -737,7 +726,6 @@ static const struct ath10k_hif_ops ath10k_usb_hif_ops = { 
	.stop			= ath10k_usb_hif_stop,

	.map_service_to_pipe	= ath10k_usb_hif_map_service_to_pipe,

	.get_default_pipe	= ath10k_usb_hif_get_default_pipe,

	.send_complete_check	= ath10k_usb_hif_send_complete_check,

	.get_free_queue_number	= ath10k_usb_hif_get_free_queue_number,

	.power_up		= ath10k_usb_hif_power_up,

	.power_down		= ath10k_usb_hif_power_down,