qcacld-3.0: remove redundant snoc pld APIs

The snoc wlan platform driver supports snoc API with
the device pointer in all upstream kernel, So remove
the redundant snoc APIs from the pld layer.

CRs-Fixed: 2173110
Change-Id: Iee8bce586569e135da81f9a465a9e7df8b042af4

core/pld/src/pld_snoc.c

@@ -317,7 +317,6 @@ void pld_snoc_unregister_driver(void)
  *         Non zero failure code for errors
  */
 
-#ifdef ICNSS_API_WITH_DEV
 int pld_snoc_wlan_enable(struct device *dev, struct pld_wlan_enable_cfg *config,
 			 enum pld_driver_mode mode, const char *host_version)
 {
@@ -351,38 +350,6 @@ int pld_snoc_wlan_enable(struct device *dev, struct pld_wlan_enable_cfg *config,
 
 	return icnss_wlan_enable(dev, &cfg, icnss_mode, host_version);
 }
-#else
-int pld_snoc_wlan_enable(struct device *dev, struct pld_wlan_enable_cfg *config,
-			 enum pld_driver_mode mode, const char *host_version)
-{
-	struct icnss_wlan_enable_cfg cfg;
-	enum icnss_driver_mode icnss_mode;
-
-	cfg.num_ce_tgt_cfg = config->num_ce_tgt_cfg;
-	cfg.ce_tgt_cfg = (struct ce_tgt_pipe_cfg *)
-		config->ce_tgt_cfg;
-	cfg.num_ce_svc_pipe_cfg = config->num_ce_svc_pipe_cfg;
-	cfg.ce_svc_cfg = (struct ce_svc_pipe_cfg *)
-		config->ce_svc_cfg;
-	cfg.num_shadow_reg_cfg = config->num_shadow_reg_cfg;
-	cfg.shadow_reg_cfg = (struct icnss_shadow_reg_cfg *)
-		config->shadow_reg_cfg;
-
-	switch (mode) {
-	case PLD_FTM:
-		icnss_mode = ICNSS_FTM;
-		break;
-	case PLD_EPPING:
-		icnss_mode = ICNSS_EPPING;
-		break;
-	default:
-		icnss_mode = ICNSS_MISSION;
-		break;
-	}
-
-	return icnss_wlan_enable(&cfg, icnss_mode, host_version);
-}
-#endif
 
 /**
  * pld_snoc_wlan_disable() - Disable WLAN
@@ -394,7 +361,6 @@ int pld_snoc_wlan_enable(struct device *dev, struct pld_wlan_enable_cfg *config,
  * Return: 0 for success
  *         Non zero failure code for errors
  */
-#ifdef ICNSS_API_WITH_DEV
 int pld_snoc_wlan_disable(struct device *dev, enum pld_driver_mode mode)
 {
 	if (!dev)
@@ -402,12 +368,6 @@ int pld_snoc_wlan_disable(struct device *dev, enum pld_driver_mode mode)
 
 	return icnss_wlan_disable(dev, ICNSS_OFF);
 }
-#else
-int pld_snoc_wlan_disable(struct device *dev, enum pld_driver_mode mode)
-{
-	return icnss_wlan_disable(ICNSS_OFF);
-}
-#endif
 
 /**
  * pld_snoc_get_soc_info() - Get SOC information
@@ -419,7 +379,6 @@ int pld_snoc_wlan_disable(struct device *dev, enum pld_driver_mode mode)
  * Return: 0 for success
  *         Non zero failure code for errors
  */
-#ifdef ICNSS_API_WITH_DEV
 int pld_snoc_get_soc_info(struct device *dev, struct pld_soc_info *info)
 {
 	int ret = 0;
@@ -444,30 +403,4 @@ int pld_snoc_get_soc_info(struct device *dev, struct pld_soc_info *info)
 
 	return 0;
 }
-#else
-int pld_snoc_get_soc_info(struct device *dev, struct pld_soc_info *info)
-{
-	int ret = 0;
-	struct icnss_soc_info icnss_info;
-
-	if (info == NULL)
-		return -ENODEV;
-
-	ret = icnss_get_soc_info(&icnss_info);
-	if (0 != ret)
-		return ret;
-
-	info->v_addr = icnss_info.v_addr;
-	info->p_addr = icnss_info.p_addr;
-	info->chip_id = icnss_info.chip_id;
-	info->chip_family = icnss_info.chip_family;
-	info->board_id = icnss_info.board_id;
-	info->soc_id = icnss_info.soc_id;
-	info->fw_version = icnss_info.fw_version;
-	strlcpy(info->fw_build_timestamp, icnss_info.fw_build_timestamp,
-		sizeof(info->fw_build_timestamp));
-
-	return 0;
-}
-#endif
 #endif

core/pld/src/pld_snoc.h

@@ -141,7 +141,6 @@ int pld_snoc_wlan_enable(struct device *dev,
 int pld_snoc_wlan_disable(struct device *dev, enum pld_driver_mode mode);
 int pld_snoc_get_soc_info(struct device *dev, struct pld_soc_info *info);
 
-#ifdef ICNSS_API_WITH_DEV
 static inline int pld_snoc_ce_request_irq(struct device *dev,
 					  unsigned int ce_id,
 					  irqreturn_t (*handler)(int, void *),
@@ -190,42 +189,6 @@ static inline int pld_snoc_get_irq(struct device *dev, int ce_id)
 
 	return icnss_get_irq(dev, ce_id);
 }
-#else
-static inline int pld_snoc_ce_request_irq(struct device *dev,
-					  unsigned int ce_id,
-					  irqreturn_t (*handler)(int, void *),
-					  unsigned long flags,
-					  const char *name, void *ctx)
-{
-	return icnss_ce_request_irq(ce_id, handler, flags, name, ctx);
-}
-
-static inline void pld_snoc_enable_irq(struct device *dev, unsigned int ce_id)
-{
-	icnss_enable_irq(ce_id);
-}
-
-static inline void pld_snoc_disable_irq(struct device *dev, unsigned int ce_id)
-{
-	icnss_disable_irq(ce_id);
-}
-
-static inline int pld_snoc_ce_free_irq(struct device *dev,
-				       unsigned int ce_id, void *ctx)
-{
-	return icnss_ce_free_irq(ce_id, ctx);
-}
-
-static inline int pld_snoc_get_ce_id(struct device *dev, int irq)
-{
-	return icnss_get_ce_id(irq);
-}
-
-static inline int pld_snoc_get_irq(struct device *dev, int ce_id)
-{
-	return icnss_get_irq(ce_id);
-}
-#endif
 
 static inline int pld_snoc_power_on(struct device *dev)
 {
@@ -267,7 +230,6 @@ static inline int pld_snoc_is_fw_down(struct device *dev)
 	return icnss_is_fw_down();
 }
 
-#ifdef ICNSS_API_WITH_DEV
 static inline int pld_snoc_is_qmi_disable(struct device *dev)
 {
 	if (!dev)
@@ -283,17 +245,6 @@ static inline int pld_snoc_set_fw_log_mode(struct device *dev, u8 fw_log_mode)
 
 	return icnss_set_fw_log_mode(dev, fw_log_mode);
 }
-#else
-static inline int pld_snoc_is_qmi_disable(struct device *dev)
-{
-	return icnss_is_qmi_disable();
-}
-
-static inline int pld_snoc_set_fw_log_mode(struct device *dev, u8 fw_log_mode)
-{
-	return icnss_set_fw_log_mode(fw_log_mode);
-}
-#endif
 
 static inline int pld_snoc_force_assert_target(struct device *dev)
 {