Explorar o código

qcacld-3.0: Remove unused PLD PCIe APIs

These APIs are replaced by the ones with device pointer.

Change-Id: Ic13409af5814dec65ac071236af780159624c147
CRs-fixed: 2151189
Yue Ma %!s(int64=7) %!d(string=hai) anos
pai
achega
b8b2946e3b
Modificáronse 2 ficheiros con 0 adicións e 111 borrados
  1. 0 55
      core/pld/src/pld_pcie.c
  2. 0 56
      core/pld/src/pld_pcie.h

+ 0 - 55
core/pld/src/pld_pcie.c

@@ -618,7 +618,6 @@ int pld_pcie_wlan_disable(struct device *dev, enum pld_driver_mode mode)
  * Return: 0 for success
  *         Non zero failure code for errors
  */
-#ifdef CNSS_API_WITH_DEV
 int pld_pcie_get_fw_files_for_target(struct device *dev,
 				     struct pld_fw_files *pfw_files,
 				     u32 target_type, u32 target_version)
@@ -653,42 +652,6 @@ int pld_pcie_get_fw_files_for_target(struct device *dev,
 
 	return 0;
 }
-#else
-int pld_pcie_get_fw_files_for_target(struct device *dev,
-				     struct pld_fw_files *pfw_files,
-				     u32 target_type, u32 target_version)
-{
-	int ret = 0;
-	struct cnss_fw_files cnss_fw_files;
-
-	if (pfw_files == NULL)
-		return -ENODEV;
-
-	memset(pfw_files, 0, sizeof(*pfw_files));
-
-	ret = cnss_get_fw_files_for_target(&cnss_fw_files,
-					   target_type, target_version);
-	if (ret)
-		return ret;
-
-	strlcpy(pfw_files->image_file, cnss_fw_files.image_file,
-		PLD_MAX_FILE_NAME);
-	strlcpy(pfw_files->board_data, cnss_fw_files.board_data,
-		PLD_MAX_FILE_NAME);
-	strlcpy(pfw_files->otp_data, cnss_fw_files.otp_data,
-		PLD_MAX_FILE_NAME);
-	strlcpy(pfw_files->utf_file, cnss_fw_files.utf_file,
-		PLD_MAX_FILE_NAME);
-	strlcpy(pfw_files->utf_board_data, cnss_fw_files.utf_board_data,
-		PLD_MAX_FILE_NAME);
-	strlcpy(pfw_files->epping_file, cnss_fw_files.epping_file,
-		PLD_MAX_FILE_NAME);
-	strlcpy(pfw_files->evicted_data, cnss_fw_files.evicted_data,
-		PLD_MAX_FILE_NAME);
-
-	return 0;
-}
-#endif
 
 /**
  * pld_pcie_get_platform_cap() - Get platform capabilities
@@ -700,7 +663,6 @@ int pld_pcie_get_fw_files_for_target(struct device *dev,
  * Return: 0 for success
  *         Non zero failure code for errors
  */
-#ifdef CNSS_API_WITH_DEV
 int pld_pcie_get_platform_cap(struct device *dev, struct pld_platform_cap *cap)
 {
 	int ret = 0;
@@ -716,23 +678,6 @@ int pld_pcie_get_platform_cap(struct device *dev, struct pld_platform_cap *cap)
 	memcpy(cap, &cnss_cap, sizeof(*cap));
 	return 0;
 }
-#else
-int pld_pcie_get_platform_cap(struct device *dev, struct pld_platform_cap *cap)
-{
-	int ret = 0;
-	struct cnss_platform_cap cnss_cap;
-
-	if (cap == NULL)
-		return -ENODEV;
-
-	ret = cnss_get_platform_cap(&cnss_cap);
-	if (ret)
-		return ret;
-
-	memcpy(cap, &cnss_cap, sizeof(*cap));
-	return 0;
-}
-#endif
 
 /**
  * pld_pcie_get_soc_info() - Get SOC information

+ 0 - 56
core/pld/src/pld_pcie.h

@@ -133,17 +133,10 @@ static inline int pld_pcie_wlan_pm_control(struct device *dev, bool vote)
 	return 0;
 }
 #else
-#ifdef CNSS_API_WITH_DEV
 static inline int pld_pcie_wlan_pm_control(struct device *dev, bool vote)
 {
 	return cnss_wlan_pm_control(dev, vote);
 }
-#else
-static inline int pld_pcie_wlan_pm_control(struct device *dev, bool vote)
-{
-	return cnss_wlan_pm_control(vote);
-}
-#endif
 #endif
 
 #ifndef CONFIG_PLD_PCIE_CNSS
@@ -304,7 +297,6 @@ static inline int pld_pcie_athdiag_write(struct device *dev, uint32_t offset,
 	return cnss_athdiag_write(dev, offset, memtype, datalen, input);
 }
 
-#ifdef CNSS_API_WITH_DEV
 static inline void *pld_pcie_get_virt_ramdump_mem(struct device *dev,
 						  unsigned long *size)
 {
@@ -351,54 +343,6 @@ static inline void pld_pcie_release_pm_sem(struct device *dev)
 {
 	cnss_release_pm_sem(dev);
 }
-#else
-static inline void *pld_pcie_get_virt_ramdump_mem(struct device *dev,
-						  unsigned long *size)
-{
-	return cnss_get_virt_ramdump_mem(size);
-}
-
-static inline void pld_pcie_device_crashed(struct device *dev)
-{
-	cnss_device_crashed();
-}
-
-static inline void pld_pcie_request_pm_qos(struct device *dev, u32 qos_val)
-{
-	cnss_request_pm_qos(qos_val);
-}
-
-static inline void pld_pcie_remove_pm_qos(struct device *dev)
-{
-	cnss_remove_pm_qos();
-}
-
-static inline int pld_pcie_request_bus_bandwidth(struct device *dev,
-						 int bandwidth)
-{
-	return cnss_request_bus_bandwidth(bandwidth);
-}
-
-static inline int pld_pcie_auto_suspend(struct device *dev)
-{
-	return cnss_auto_suspend();
-}
-
-static inline int pld_pcie_auto_resume(struct device *dev)
-{
-	return cnss_auto_resume();
-}
-
-static inline void pld_pcie_lock_pm_sem(struct device *dev)
-{
-	cnss_lock_pm_sem();
-}
-
-static inline void pld_pcie_release_pm_sem(struct device *dev)
-{
-	cnss_release_pm_sem();
-}
-#endif
 
 static inline int pld_pcie_power_on(struct device *dev)
 {