evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "icnss: Remove dev reference"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-13 12:17:58 -08:00 • committed by Gerrit - the friendly Code Review server
commit d18c993351
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/soc/qcom/icnss.c
View file

@ -3557,18 +3557,16 @@ unsigned int icnss_socinfo_get_serial_number(struct device *dev)
}
EXPORT_SYMBOL(icnss_socinfo_get_serial_number);
int icnss_set_wlan_mac_address(struct device *dev,
const u8 *in, uint32_t len)
int icnss_set_wlan_mac_address(const u8 *in, const uint32_t len)
{
struct icnss_priv *priv = dev_get_drvdata(dev);
struct icnss_priv *priv = penv;
uint32_t no_of_mac_addr;
struct icnss_wlan_mac_addr *addr = NULL;
int iter;
u8 *temp = NULL;
if (priv->magic != ICNSS_MAGIC) {
icnss_pr_err("Invalid drvdata: dev %p, data %p, magic 0x%x\n",
dev, priv, priv->magic);
if (!priv) {
icnss_pr_err("Priv data is NULL\n");
return -EINVAL;
}

3
include/soc/qcom/icnss.h
View file

@ -124,8 +124,7 @@ extern int icnss_get_wlan_unsafe_channel(u16 *unsafe_ch_list, u16 *ch_count,
extern int icnss_wlan_set_dfs_nol(const void *info, u16 info_len);
extern int icnss_wlan_get_dfs_nol(void *info, u16 info_len);
extern bool icnss_is_qmi_disable(void);
extern int icnss_set_wlan_mac_address(struct device *dev,
const u8 *in, uint32_t len);
extern int icnss_set_wlan_mac_address(const u8 *in, const uint32_t len);
extern u8 *icnss_get_wlan_mac_address(struct device *dev, uint32_t *num);
#endif /* _ICNSS_WLAN_H_ */