Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b117b0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Fix kernel checkpatch issues"

parents a645a761 c1bbe6d5

drivers/net/wireless/cnss2/main.c

+17 −17
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ static DECLARE_RWSEM(cnss_pm_sem); 


static bool qmi_bypass;

#ifdef CONFIG_CNSS2_DEBUG

module_param(qmi_bypass, bool, S_IRUSR | S_IWUSR);

module_param(qmi_bypass, bool, 0600);

MODULE_PARM_DESC(qmi_bypass, "Bypass QMI from platform driver");

#endif



static bool enable_waltest;

#ifdef CONFIG_CNSS2_DEBUG

module_param(enable_waltest, bool, S_IRUSR | S_IWUSR);

module_param(enable_waltest, bool, 0600);

MODULE_PARM_DESC(enable_waltest, "Enable to handle firmware waltest");

#endif
@@ -60,7 +60,7 @@ enum cnss_debug_quirks { 


unsigned long quirks;

#ifdef CONFIG_CNSS2_DEBUG

module_param(quirks, ulong, S_IRUSR | S_IWUSR);

module_param(quirks, ulong, 0600);

MODULE_PARM_DESC(quirks, "Debug quirks for the driver");

#endif
@@ -231,7 +231,7 @@ int cnss_request_bus_bandwidth(int bandwidth) 


	bus_bw_info = &plat_priv->bus_bw_info;

	if (!bus_bw_info->bus_client)

		return -ENOSYS;

		return -EINVAL;



	switch (bandwidth) {

	case CNSS_BUS_WIDTH_NONE:
@@ -320,7 +320,7 @@ void cnss_remove_pm_qos(void) 
}

EXPORT_SYMBOL(cnss_remove_pm_qos);



u8 *cnss_common_get_wlan_mac_address(struct device *dev, uint32_t *num)

u8 *cnss_common_get_wlan_mac_address(struct device *dev, u32 *num)

{

	struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(dev);

	struct cnss_wlan_mac_info *wlan_mac_info;
@@ -439,8 +439,8 @@ int cnss_wlan_disable(struct device *dev, enum cnss_driver_mode mode) 
EXPORT_SYMBOL(cnss_wlan_disable);



#ifdef CONFIG_CNSS2_DEBUG

int cnss_athdiag_read(struct device *dev, uint32_t offset, uint32_t mem_type,

		      uint32_t data_len, uint8_t *output)

int cnss_athdiag_read(struct device *dev, u32 offset, u32 mem_type,

		      u32 data_len, u8 *output)

{

	struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(dev);

	int ret = 0;
@@ -475,8 +475,8 @@ out: 
}

EXPORT_SYMBOL(cnss_athdiag_read);



int cnss_athdiag_write(struct device *dev, uint32_t offset, uint32_t mem_type,

		       uint32_t data_len, uint8_t *input)

int cnss_athdiag_write(struct device *dev, u32 offset, u32 mem_type,

		       u32 data_len, u8 *input)

{

	struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(dev);

	int ret = 0;
@@ -511,22 +511,22 @@ out: 
}

EXPORT_SYMBOL(cnss_athdiag_write);

#else

int cnss_athdiag_read(struct device *dev, uint32_t offset, uint32_t mem_type,

		      uint32_t data_len, uint8_t *output)

int cnss_athdiag_read(struct device *dev, u32 offset, u32 mem_type,

		      u32 data_len, u8 *output)

{

	return -EPERM;

}

EXPORT_SYMBOL(cnss_athdiag_read);



int cnss_athdiag_write(struct device *dev, uint32_t offset, uint32_t mem_type,

		       uint32_t data_len, uint8_t *input)

int cnss_athdiag_write(struct device *dev, u32 offset, u32 mem_type,

		       u32 data_len, u8 *input)

{

	return -EPERM;

}

EXPORT_SYMBOL(cnss_athdiag_write);

#endif



int cnss_set_fw_log_mode(struct device *dev, uint8_t fw_log_mode)

int cnss_set_fw_log_mode(struct device *dev, u8 fw_log_mode)

{

	struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(dev);
@@ -886,9 +886,9 @@ static int cnss_modem_notifier_nb(struct notifier_block *nb, 


	esoc_info = &plat_priv->esoc_info;



	if (SUBSYS_AFTER_POWERUP == code)

	if (code == SUBSYS_AFTER_POWERUP)

		esoc_info->modem_current_status = 1;

	else if (SUBSYS_BEFORE_SHUTDOWN == code)

	else if (code == SUBSYS_BEFORE_SHUTDOWN)

		esoc_info->modem_current_status = 0;

	else

		return NOTIFY_DONE;
@@ -2087,7 +2087,7 @@ static ssize_t cnss_fs_ready_store(struct device *dev, 
	return count;

}



static DEVICE_ATTR(fs_ready, S_IWUSR | S_IWGRP, NULL, cnss_fs_ready_store);

static DEVICE_ATTR(fs_ready, 0220, NULL, cnss_fs_ready_store);



static int cnss_create_sysfs(struct cnss_plat_data *plat_priv)

{

drivers/net/wireless/cnss2/main.h

+7 −7
Original line number Diff line number Diff line
@@ -64,16 +64,16 @@ struct cnss_dump_seg { 
	unsigned long address;

	void *v_address;

	unsigned long size;

	uint32_t type;

	u32 type;

};



struct cnss_dump_data {

	uint32_t version;

	uint32_t magic;

	u32 version;

	u32 magic;

	char name[32];

	phys_addr_t paddr;

	int nentries;

	uint32_t seg_version;

	u32 seg_version;

};



struct cnss_ramdump_info_v2 {
@@ -93,13 +93,13 @@ struct cnss_esoc_info { 


struct cnss_bus_bw_info {

	struct msm_bus_scale_pdata *bus_scale_table;

	uint32_t bus_client;

	u32 bus_client;

	int current_bw_vote;

};



struct cnss_wlan_mac_addr {

	u8 mac_addr[MAX_NO_OF_MAC_ADDR][ETH_ALEN];

	uint32_t no_of_mac_addr_set;

	u32 no_of_mac_addr_set;

};



struct cnss_wlan_mac_info {
@@ -181,7 +181,7 @@ struct cnss_plat_data { 
	unsigned long device_id;

	struct cnss_wlan_driver *driver_ops;

	enum cnss_driver_status driver_status;

	uint32_t recovery_count;

	u32 recovery_count;

	struct cnss_wlan_mac_info wlan_mac_info;

	unsigned long driver_state;

	struct list_head event_list;

drivers/net/wireless/cnss2/pci.c

+7 −7
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ 
static DEFINE_SPINLOCK(pci_link_down_lock);



static unsigned int pci_link_down_panic;

module_param(pci_link_down_panic, uint, S_IRUSR | S_IWUSR);

module_param(pci_link_down_panic, uint, 0600);

MODULE_PARM_DESC(pci_link_down_panic,

		 "Trigger kernel panic when PCI link down is detected");



static bool fbc_bypass;

#ifdef CONFIG_CNSS2_DEBUG

module_param(fbc_bypass, bool, S_IRUSR | S_IWUSR);

module_param(fbc_bypass, bool, 0600);

MODULE_PARM_DESC(fbc_bypass,

		 "Bypass firmware download when loading WLAN driver");

#endif
@@ -869,8 +869,8 @@ static void cnss_pci_disable_msi(struct cnss_pci_data *pci_priv) 
}



int cnss_get_user_msi_assignment(struct device *dev, char *user_name,

				 int *num_vectors, uint32_t *user_base_data,

				 uint32_t *base_vector)

				 int *num_vectors, u32 *user_base_data,

				 u32 *base_vector)

{

	struct cnss_pci_data *pci_priv = dev_get_drvdata(dev);

	struct cnss_msi_config *msi_config;
@@ -914,8 +914,8 @@ int cnss_get_msi_irq(struct device *dev, unsigned int vector) 
}

EXPORT_SYMBOL(cnss_get_msi_irq);



void cnss_get_msi_address(struct device *dev, uint32_t *msi_addr_low,

			  uint32_t *msi_addr_high)

void cnss_get_msi_address(struct device *dev, u32 *msi_addr_low,

			  u32 *msi_addr_high)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -931,7 +931,7 @@ static int cnss_pci_enable_bus(struct cnss_pci_data *pci_priv) 
{

	int ret = 0;

	struct pci_dev *pci_dev = pci_priv->pci_dev;

	uint16_t device_id;

	u16 device_id;



	pci_read_config_word(pci_dev, PCI_DEVICE_ID, &device_id);

	if (device_id != pci_priv->pci_device_id->device)  {

drivers/net/wireless/cnss2/pci.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ enum cnss_mhi_state { 
struct cnss_msi_user {

	char *name;

	int num_vectors;

	uint32_t base_vector;

	u32 base_vector;

};



struct cnss_msi_config {
@@ -73,7 +73,7 @@ struct cnss_pci_data { 
	size_t smmu_iova_len;

	void __iomem *bar;

	struct cnss_msi_config *msi_config;

	uint32_t msi_ep_base_data;

	u32 msi_ep_base_data;

	struct mhi_device mhi_dev;

	unsigned long mhi_state;

};

drivers/net/wireless/cnss2/qmi.c

+9 −9
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#ifdef CONFIG_CNSS2_DEBUG

static unsigned int qmi_timeout = 10000;

module_param(qmi_timeout, uint, S_IRUSR | S_IWUSR);

module_param(qmi_timeout, uint, 0600);

MODULE_PARM_DESC(qmi_timeout, "Timeout for QMI message in milliseconds");



#define QMI_WLFW_TIMEOUT_MS		qmi_timeout
@@ -36,12 +36,12 @@ MODULE_PARM_DESC(qmi_timeout, "Timeout for QMI message in milliseconds"); 
#endif



static bool daemon_support;

module_param(daemon_support, bool, S_IRUSR | S_IWUSR);

module_param(daemon_support, bool, 0600);

MODULE_PARM_DESC(daemon_support, "User space has cnss-daemon support or not");



static bool bdf_bypass = true;

#ifdef CONFIG_CNSS2_DEBUG

module_param(bdf_bypass, bool, S_IRUSR | S_IWUSR);

module_param(bdf_bypass, bool, 0600);

MODULE_PARM_DESC(bdf_bypass, "If BDF is not found, send dummy BDF to FW");

#endif
@@ -422,7 +422,7 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) 
		goto out;

	}



	if (0xFF == plat_priv->board_info.board_id)

	if (plat_priv->board_info.board_id == 0xFF)

		snprintf(filename, sizeof(filename), DEFAULT_BDF_FILE_NAME);

	else

		snprintf(filename, sizeof(filename),
@@ -680,8 +680,8 @@ out: 
}



int cnss_wlfw_athdiag_read_send_sync(struct cnss_plat_data *plat_priv,

				     uint32_t offset, uint32_t mem_type,

				     uint32_t data_len, uint8_t *data)

				     u32 offset, u32 mem_type,

				     u32 data_len, u8 *data)

{

	struct wlfw_athdiag_read_req_msg_v01 req;

	struct wlfw_athdiag_read_resp_msg_v01 *resp;
@@ -746,8 +746,8 @@ out: 
}



int cnss_wlfw_athdiag_write_send_sync(struct cnss_plat_data *plat_priv,

				      uint32_t offset, uint32_t mem_type,

				      uint32_t data_len, uint8_t *data)

				      u32 offset, u32 mem_type,

				      u32 data_len, u8 *data)

{

	struct wlfw_athdiag_write_req_msg_v01 *req;

	struct wlfw_athdiag_write_resp_msg_v01 resp;
@@ -804,7 +804,7 @@ out: 
}



int cnss_wlfw_ini_send_sync(struct cnss_plat_data *plat_priv,

			    uint8_t fw_log_mode)

			    u8 fw_log_mode)

{

	int ret;

	struct wlfw_ini_req_msg_v01 req;