Преглед на файлове

qcacld-3.0: change prototype of pld_wlan_enable

Change the function prototype of pld_wlan_enable, to use local
version string.

Change-Id: Ic4c46b609afc8f9510a5c4cbf5e708e28c82d066
Vevek Venkatesan преди 5 години
родител
ревизия
4a03124774
променени са 2 файла, в които са добавени 7 реда и са изтрити 6 реда
  1. 1 1
      core/pld/inc/pld_common.h
  2. 6 5
      core/pld/src/pld_common.c

+ 1 - 1
core/pld/inc/pld_common.h

@@ -393,7 +393,7 @@ int pld_register_driver(struct pld_driver_ops *ops);
 void pld_unregister_driver(void);
 
 int pld_wlan_enable(struct device *dev, struct pld_wlan_enable_cfg *config,
-		    enum pld_driver_mode mode, const char *host_version);
+		    enum pld_driver_mode mode);
 int pld_wlan_disable(struct device *dev, enum pld_driver_mode mode);
 int pld_set_fw_log_mode(struct device *dev, u8 fw_log_mode);
 void pld_get_default_fw_files(struct pld_fw_files *pfw_files);

+ 6 - 5
core/pld/src/pld_common.c

@@ -39,6 +39,7 @@
 #include "pld_snoc.h"
 #include "pld_sdio.h"
 #include "pld_usb.h"
+#include "qwlan_version.h"
 
 #define PLD_PCIE_REGISTERED BIT(0)
 #define PLD_SNOC_REGISTERED BIT(1)
@@ -349,7 +350,6 @@ void pld_unregister_driver(void)
  * @dev: device
  * @config: WLAN configuration data
  * @mode: WLAN mode
- * @host_version: host software version
  *
  * This function enables WLAN FW. It passed WLAN configuration data,
  * WLAN mode and host software version to FW.
@@ -358,23 +358,24 @@ void pld_unregister_driver(void)
  *         Non zero failure code for errors
  */
 int pld_wlan_enable(struct device *dev, struct pld_wlan_enable_cfg *config,
-		    enum pld_driver_mode mode, const char *host_version)
+		    enum pld_driver_mode mode)
 {
 	int ret = 0;
 	struct device *ifdev;
 
 	switch (pld_get_bus_type(dev)) {
 	case PLD_BUS_TYPE_PCIE:
-		ret = pld_pcie_wlan_enable(dev, config, mode, host_version);
+		ret = pld_pcie_wlan_enable(dev, config, mode, QWLAN_VERSIONSTR);
 		break;
 	case PLD_BUS_TYPE_SNOC:
-		ret = pld_snoc_wlan_enable(dev, config, mode, host_version);
+		ret = pld_snoc_wlan_enable(dev, config, mode, QWLAN_VERSIONSTR);
 		break;
 	case PLD_BUS_TYPE_SDIO:
 		break;
 	case PLD_BUS_TYPE_USB:
 		ifdev = pld_get_if_dev(dev);
-		ret = pld_usb_wlan_enable(ifdev, config, mode, host_version);
+		ret = pld_usb_wlan_enable(ifdev, config, mode,
+					  QWLAN_VERSIONSTR);
 		break;
 	default:
 		ret = -EINVAL;