staging: wilc1000: remove 'linux_' prefix in function names (c6eab5e6) · Commits · 戴 / test

drivers/staging/wilc1000/linux_wlan.c

+8 −9

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc)
		return ret_val;
		}

		static int linux_wlan_txq_task(void *vp)
		static int wilc_txq_task(void *vp)
		{
		int ret;
		u32 txq_count;
		@@ -202,7 +202,7 @@ fail:
		return ret;
		}

		static int linux_wlan_start_firmware(struct net_device *dev)
		static int wilc_start_firmware(struct net_device *dev)
		{
		struct wilc_vif *vif = netdev_priv(dev);
		struct wilc *wilc = vif->wilc;
		@@ -243,8 +243,7 @@ static int wilc1000_firmware_download(struct net_device *dev)
		return 0;
		}

		static int linux_wlan_init_fw_config(struct net_device *dev,
		struct wilc_vif *vif)
		static int wilc_init_fw_config(struct net_device dev, struct wilc_vif vif)
		{
		struct wilc_priv *priv;
		struct host_if_drv *hif_drv;
		@@ -502,7 +501,7 @@ static int wlan_initialize_threads(struct net_device *dev)
		struct wilc_vif *vif = netdev_priv(dev);
		struct wilc *wilc = vif->wilc;

		wilc->txq_thread = kthread_run(linux_wlan_txq_task, (void *)dev,
		wilc->txq_thread = kthread_run(wilc_txq_task, (void *)dev,
		"K_TXQ_TASK");
		if (IS_ERR(wilc->txq_thread)) {
		netdev_err(dev, "couldn't create TXQ thread\n");
		@@ -560,7 +559,7 @@ static int wilc_wlan_initialize(struct net_device dev, struct wilc_vif vif)
		goto fail_irq_enable;
		}

		ret = linux_wlan_start_firmware(dev);
		ret = wilc_start_firmware(dev);
		if (ret < 0) {
		ret = -EIO;
		goto fail_irq_enable;
		@@ -576,7 +575,7 @@ static int wilc_wlan_initialize(struct net_device dev, struct wilc_vif vif)
		firmware_ver[size] = '\0';
		netdev_dbg(dev, "Firmware Ver = %s\n", firmware_ver);
		}
		ret = linux_wlan_init_fw_config(dev, vif);
		ret = wilc_init_fw_config(dev, vif);

		if (ret < 0) {
		netdev_err(dev, "Failed to configure firmware\n");
		@@ -726,7 +725,7 @@ static void wilc_set_multicast_list(struct net_device *dev)
		kfree(mc_list);
		}

		static void linux_wlan_tx_complete(void *priv, int status)
		static void wilc_tx_complete(void *priv, int status)
		{
		struct tx_complete_data *pv_data = priv;

		@@ -762,7 +761,7 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff skb, struct net_device ndev)
		tx_data->bssid = wilc->vif[vif->idx]->bssid;
		queue_count = wilc_wlan_txq_add_net_pkt(ndev, (void *)tx_data,
		tx_data->buff, tx_data->size,
		linux_wlan_tx_complete);
		wilc_tx_complete);

		if (queue_count > FLOW_CONTROL_UPPER_THRESHOLD) {
		if (wilc->vif[0]->mac_opened)

drivers/staging/wilc1000/wilc_sdio.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ static int wilc_sdio_cmd53(struct wilc wilc, struct sdio_cmd53 cmd)
		return ret;
		}

		static int linux_sdio_probe(struct sdio_func *func,
		static int wilc_sdio_probe(struct sdio_func *func,
		const struct sdio_device_id *id)
		{
		struct wilc *wilc;
		@@ -156,7 +156,7 @@ static int linux_sdio_probe(struct sdio_func *func,
		return 0;
		}

		static void linux_sdio_remove(struct sdio_func *func)
		static void wilc_sdio_remove(struct sdio_func *func)
		{
		struct wilc *wilc = sdio_get_drvdata(func);

		@@ -1127,8 +1127,8 @@ static const struct dev_pm_ops wilc_sdio_pm_ops = {
		static struct sdio_driver wilc_sdio_driver = {
		.name = SDIO_MODALIAS,
		.id_table = wilc_sdio_ids,
		.probe = linux_sdio_probe,
		.remove = linux_sdio_remove,
		.probe = wilc_sdio_probe,
		.remove = wilc_sdio_remove,
		.drv = {
		.pm = &wilc_sdio_pm_ops,
		.of_match_table = wilc_of_match,

Admin message