A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: change prototype of pld_wlan_enable" into wlan-cld3.driver.lnx.2.0

Browse source
This commit is contained in:
CNSS_WLAN Service 2019-07-04 10:05:09 -07:00 • committed by Gerrit - the friendly Code Review server
commit d65b79d817
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/pld/inc/pld_common.h
View file

@ -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);

11
core/pld/src/pld_common.c
View file

@ -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;