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

Commit 1fa617f9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Remove deprecated CNSS_BDF_DUMMY type"

parents 88b27033 03e41230

drivers/net/wireless/cnss2/main.h

+0 −1
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ enum cnss_bdf_type { 
	CNSS_BDF_BIN,

	CNSS_BDF_ELF,

	CNSS_BDF_REGDB = 4,

	CNSS_BDF_DUMMY = 255,

};



enum cnss_cal_status {

drivers/net/wireless/cnss2/qmi.c

+4 −18
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#define BIN_BDF_FILE_NAME_PREFIX	"bdwlan.b"

#define BIN_BDF_FILE_NAME_GF_PREFIX	"bdwlang.b"

#define REGDB_FILE_NAME			"regdb.bin"

#define DUMMY_BDF_FILE_NAME		"bdwlan.dmy"

#define CHIP_ID_GF_MASK			0x10



#define QDSS_TRACE_CONFIG_FILE		"qdss_trace_config"
@@ -550,11 +549,6 @@ static int cnss_get_bdf_file_name(struct cnss_plat_data *plat_priv, 
	case CNSS_BDF_REGDB:

		snprintf(filename_tmp, filename_len, REGDB_FILE_NAME);

		break;

	case CNSS_BDF_DUMMY:

		cnss_pr_dbg("CNSS_BDF_DUMMY is set, sending dummy BDF\n");

		snprintf(filename_tmp, filename_len, DUMMY_BDF_FILE_NAME);

		ret = MAX_FIRMWARE_NAME_LEN;

		break;

	default:

		cnss_pr_err("Invalid BDF type: %d\n",

			    plat_priv->ctrl_params.bdf_type);
@@ -562,7 +556,7 @@ static int cnss_get_bdf_file_name(struct cnss_plat_data *plat_priv, 
		break;

	}



	if (ret >= 0)

	if (!ret)

		cnss_bus_add_fw_prefix_name(plat_priv, filename, filename_tmp);



	return ret;
@@ -595,13 +589,8 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 


	ret = cnss_get_bdf_file_name(plat_priv, bdf_type,

				     filename, sizeof(filename));

	if (ret > 0) {

		temp = DUMMY_BDF_FILE_NAME;

		remaining = MAX_FIRMWARE_NAME_LEN;

		goto bypass_bdf;

	} else if (ret < 0) {

	if (ret)

		goto err_req_fw;

	}



	if (bdf_type == CNSS_BDF_REGDB)

		ret = cnss_request_firmware_direct(plat_priv, &fw_entry,
@@ -618,7 +607,6 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 
	temp = fw_entry->data;

	remaining = fw_entry->size;



bypass_bdf:

	cnss_pr_dbg("Downloading BDF: %s, size: %u\n", filename, remaining);



	while (remaining) {
@@ -681,7 +669,6 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 
		req->seg_id++;

	}



	if (bdf_type != CNSS_BDF_DUMMY)

	release_firmware(fw_entry);



	/* QCA6490 enable S3E regulator for IPA configuration only */
@@ -695,7 +682,6 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 
	return 0;



err_send:

	if (bdf_type != CNSS_BDF_DUMMY)

	release_firmware(fw_entry);

err_req_fw:

	if (!(bdf_type == CNSS_BDF_REGDB ||