Staging: rtl8192e: Remove function name comments at end of functions (d5abdf72) · Commits · jan.koester / Linux

drivers/staging/rtl8192e/r8192E_core.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5591,7 +5591,7 @@ static u8 rtl819x_query_rxpwrpercentage(
	return (100+antpower);		return (100+antpower);
	}		}

	} /* QueryRxPwrPercentage */		}

	static u8		static u8
	rtl819x_evm_dbtopercentage(		rtl819x_evm_dbtopercentage(
	@@ -5943,7 +5943,7 @@ static void rtl8192_query_rxphystatus(
	if (rf_rx_num != 0)		if (rf_rx_num != 0)
	pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping((long)(total_rssi/=rf_rx_num)));		pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping((long)(total_rssi/=rf_rx_num)));
	}		}
	} /* QueryRxPhyStatus8190Pci */		}

	static void		static void
	rtl8192_record_rxdesc_forlateruse(		rtl8192_record_rxdesc_forlateruse(

drivers/staging/rtl8192e/r8192E_dm.c

+26 −26

Original line number	Original line	Diff line number	Diff line
	@@ -207,7 +207,7 @@ void init_hal_dm(struct net_device *dev)
	INIT_DELAYED_WORK(&priv->gpio_change_rf_wq, dm_gpio_change_rf_callback);		INIT_DELAYED_WORK(&priv->gpio_change_rf_wq, dm_gpio_change_rf_callback);
	#endif		#endif

	} // InitHalDm		}

	void deinit_hal_dm(struct net_device *dev)		void deinit_hal_dm(struct net_device *dev)
	{		{
	@@ -270,7 +270,7 @@ void dm_CheckRxAggregation(struct net_device *dev) {

	lastTxOkCnt = priv->stats.txbytesunicast;		lastTxOkCnt = priv->stats.txbytesunicast;
	lastRxOkCnt = priv->stats.rxbytesunicast;		lastRxOkCnt = priv->stats.rxbytesunicast;
	} // dm_CheckEdcaTurbo		}
	#endif		#endif


	@@ -328,7 +328,7 @@ void hal_dm_watchdog(struct net_device *dev)
	#ifdef USB_RX_AGGREGATION_SUPPORT		#ifdef USB_RX_AGGREGATION_SUPPORT
	dm_CheckRxAggregation(dev);		dm_CheckRxAggregation(dev);
	#endif		#endif
	} //HalDmWatchDog		}


	/*		/*
	@@ -380,7 +380,7 @@ void init_rate_adaptive(struct net_device * dev)
	pra->ping_rssi_ratr = 0x0000000d;//cosa add for test		pra->ping_rssi_ratr = 0x0000000d;//cosa add for test
	}		}

	} // InitRateAdaptive		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -552,7 +552,7 @@ static void dm_check_rate_adaptive(struct net_device * dev)
	pra->ratr_state = DM_RATR_STA_MAX;		pra->ratr_state = DM_RATR_STA_MAX;
	}		}

	} // dm_CheckRateAdaptive		}


	static void dm_init_bandwidth_autoswitch(struct net_device * dev)		static void dm_init_bandwidth_autoswitch(struct net_device * dev)
	@@ -564,7 +564,7 @@ static void dm_init_bandwidth_autoswitch(struct net_device * dev)
	priv->ieee80211->bandwidth_auto_switch.bforced_tx20Mhz = false;		priv->ieee80211->bandwidth_auto_switch.bforced_tx20Mhz = false;
	priv->ieee80211->bandwidth_auto_switch.bautoswitch_enable = false;		priv->ieee80211->bandwidth_auto_switch.bautoswitch_enable = false;

	} // dm_init_bandwidth_autoswitch		}


	static void dm_bandwidth_autoswitch(struct net_device * dev)		static void dm_bandwidth_autoswitch(struct net_device * dev)
	@@ -583,7 +583,7 @@ static void dm_bandwidth_autoswitch(struct net_device * dev)

	}		}
	}		}
	} // dm_BandwidthAutoSwitch		}

	//OFDM default at 0db, index=6.		//OFDM default at 0db, index=6.
	#ifndef RTL8190P		#ifndef RTL8190P
	@@ -1581,7 +1581,7 @@ void dm_initialize_txpower_tracking(struct net_device *dev)
	else		else
	dm_InitializeTXPowerTracking_ThermalMeter(dev);		dm_InitializeTXPowerTracking_ThermalMeter(dev);
	#endif		#endif
	} // dm_InitializeTXPowerTracking		}


	static void dm_CheckTXPowerTracking_TSSI(struct net_device *dev)		static void dm_CheckTXPowerTracking_TSSI(struct net_device *dev)
	@@ -1659,7 +1659,7 @@ static void dm_check_txpower_tracking(struct net_device *dev)
	dm_CheckTXPowerTracking_ThermalMeter(dev);		dm_CheckTXPowerTracking_ThermalMeter(dev);
	#endif		#endif

	} // dm_CheckTXPowerTracking		}


	static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14)		static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14)
	@@ -1813,7 +1813,7 @@ static void dm_txpower_reset_recovery(
	RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in RFC_txPowerTrackingIndex is %x\n",priv->rfc_txpowertrackingindex);		RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in RFC_txPowerTrackingIndex is %x\n",priv->rfc_txpowertrackingindex);
	RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery : RF C I/Q Amplify Gain is %ld\n",priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbb_iq_amplifygain);		RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery : RF C I/Q Amplify Gain is %ld\n",priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbb_iq_amplifygain);

	} // dm_TXPowerResetRecovery		}

	void dm_restore_dynamic_mechanism_state(struct net_device *dev)		void dm_restore_dynamic_mechanism_state(struct net_device *dev)
	{		{
	@@ -1859,7 +1859,7 @@ void dm_restore_dynamic_mechanism_state(struct net_device *dev)
	//		//
	dm_bb_initialgain_restore(dev);		dm_bb_initialgain_restore(dev);

	} // DM_RestoreDynamicMechanismState		}

	static void dm_bb_initialgain_restore(struct net_device *dev)		static void dm_bb_initialgain_restore(struct net_device *dev)
	{		{
	@@ -1888,7 +1888,7 @@ static void dm_bb_initialgain_restore(struct net_device *dev)
	//PHY_SetBBReg(Adapter, UFWP, bMaskLWord, 0x100);		//PHY_SetBBReg(Adapter, UFWP, bMaskLWord, 0x100);
	rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1); // Only clear byte 1 and rewrite.		rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1); // Only clear byte 1 and rewrite.

	} // dm_BBInitialGainRestore		}


	void dm_backup_dynamic_mechanism_state(struct net_device *dev)		void dm_backup_dynamic_mechanism_state(struct net_device *dev)
	@@ -1901,7 +1901,7 @@ void dm_backup_dynamic_mechanism_state(struct net_device *dev)
	//Backup BB InitialGain		//Backup BB InitialGain
	dm_bb_initialgain_backup(dev);		dm_bb_initialgain_backup(dev);

	} // DM_BackupDynamicMechanismState		}


	static void dm_bb_initialgain_backup(struct net_device *dev)		static void dm_bb_initialgain_backup(struct net_device *dev)
	@@ -1927,7 +1927,7 @@ static void dm_bb_initialgain_backup(struct net_device *dev)
	RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc68 is %x\n",priv->initgain_backup.xdagccore1);		RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc68 is %x\n",priv->initgain_backup.xdagccore1);
	RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n",priv->initgain_backup.cca);		RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n",priv->initgain_backup.cca);

	} // dm_BBInitialGainBakcup		}

	#endif		#endif
	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -2012,7 +2012,7 @@ void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type, u32
	dm_value = 0x50;		dm_value = 0x50;
	dm_digtable.rx_gain_range_max = (u8)dm_value;		dm_digtable.rx_gain_range_max = (u8)dm_value;
	}		}
	} /* DM_ChangeDynamicInitGainThresh */		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -2059,7 +2059,7 @@ static void dm_dig_init(struct net_device *dev)
	else		else
	dm_digtable.rx_gain_range_min = DM_DIG_MIN;		dm_digtable.rx_gain_range_min = DM_DIG_MIN;

	} /* dm_dig_init */		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -2131,7 +2131,7 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi(
	dm_digtable.dig_algorithm_switch = 0;		dm_digtable.dig_algorithm_switch = 0;
	dm_digtable.pre_connect_state = dm_digtable.cur_connect_state;		dm_digtable.pre_connect_state = dm_digtable.cur_connect_state;

	} /* dm_CtrlInitGainByRssi */		}

	static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(		static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
	struct net_device *dev)		struct net_device *dev)
	@@ -2302,7 +2302,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(

	dm_ctrl_initgain_byrssi_highpwr(dev);		dm_ctrl_initgain_byrssi_highpwr(dev);

	} /* dm_CtrlInitGainByRssi */		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -2393,7 +2393,7 @@ static void dm_ctrl_initgain_byrssi_highpwr(

	reset_cnt_highpwr = priv->reset_count;		reset_cnt_highpwr = priv->reset_count;

	} /* dm_CtrlInitGainByRssiHighPwr */		}


	static void dm_initial_gain(		static void dm_initial_gain(
	@@ -2647,7 +2647,7 @@ void dm_init_edca_turbo(struct net_device *dev)
	priv->bcurrent_turbo_EDCA = false;		priv->bcurrent_turbo_EDCA = false;
	priv->ieee80211->bis_any_nonbepkts = false;		priv->ieee80211->bis_any_nonbepkts = false;
	priv->bis_cur_rdlstate = false;		priv->bis_cur_rdlstate = false;
	} // dm_init_edca_turbo		}

	#if 1		#if 1
	static void dm_check_edca_turbo(		static void dm_check_edca_turbo(
	@@ -2761,7 +2761,7 @@ static void dm_check_edca_turbo(
	priv->ieee80211->bis_any_nonbepkts = false;		priv->ieee80211->bis_any_nonbepkts = false;
	lastTxOkCnt = priv->stats.txbytesunicast;		lastTxOkCnt = priv->stats.txbytesunicast;
	lastRxOkCnt = priv->stats.rxbytesunicast;		lastRxOkCnt = priv->stats.rxbytesunicast;
	} // dm_CheckEdcaTurbo		}
	#endif		#endif

	static void dm_init_ctstoself(struct net_device * dev)		static void dm_init_ctstoself(struct net_device * dev)
	@@ -2864,7 +2864,7 @@ static void dm_check_rfctrl_gpio(struct net_device * dev)
	queue_delayed_work(priv->priv_wq,&priv->gpio_change_rf_wq,0);		queue_delayed_work(priv->priv_wq,&priv->gpio_change_rf_wq,0);
	#endif		#endif

	} /* dm_CheckRfCtrlGPIO */		}

	#endif		#endif
	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -2971,7 +2971,7 @@ void dm_gpio_change_rf_callback(struct work_struct *work)

	}		}

	} /* dm_GPIOChangeRF */		}

	#endif		#endif
	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -3015,7 +3015,7 @@ void dm_rf_pathcheck_workitemcallback(struct work_struct *work)
	return;		return;

	dm_rxpath_sel_byrssi(dev);		dm_rxpath_sel_byrssi(dev);
	} /* DM_RFPathCheckWorkItemCallBack */		}

	static void dm_init_rxpath_selection(struct net_device * dev)		static void dm_init_rxpath_selection(struct net_device * dev)
	{		{
	@@ -3320,7 +3320,7 @@ static void dm_check_rx_path_selection(struct net_device *dev)
	{		{
	struct r8192_priv *priv = ieee80211_priv(dev);		struct r8192_priv *priv = ieee80211_priv(dev);
	queue_delayed_work(priv->priv_wq,&priv->rfpath_check_wq,0);		queue_delayed_work(priv->priv_wq,&priv->rfpath_check_wq,0);
	} /* dm_CheckRxRFPath */		}


	static void dm_init_fsync (struct net_device *dev)		static void dm_init_fsync (struct net_device *dev)
	@@ -3817,7 +3817,7 @@ static void dm_dynamic_txpower(struct net_device *dev)
	priv->bLastDTPFlag_High = priv->bDynamicTxHighPower;		priv->bLastDTPFlag_High = priv->bDynamicTxHighPower;
	priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower;		priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower;

	} /* dm_dynamic_txpower */		}

	//added by vivi, for read tx rate and retrycount		//added by vivi, for read tx rate and retrycount
	static void dm_check_txrateandretrycount(struct net_device * dev)		static void dm_check_txrateandretrycount(struct net_device * dev)

drivers/staging/rtl8192e/r819xE_cmdpkt.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -156,7 +156,7 @@ RT_STATUS cmpk_message_handle_tx(


	#endif		#endif
	} /* CMPK_Message_Handle_Tx */		}

	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	* Function: cmpk_counttxstatistic()		* Function: cmpk_counttxstatistic()
	@@ -250,7 +250,7 @@ cmpk_count_txstatistic(
	priv->stats.txretrycount += pstx_fb->retry_cnt;		priv->stats.txretrycount += pstx_fb->retry_cnt;
	priv->stats.txfeedbackretry += pstx_fb->retry_cnt;		priv->stats.txfeedbackretry += pstx_fb->retry_cnt;

	} /* cmpk_CountTxStatistic */		}



	@@ -334,7 +334,7 @@ cmpk_handle_tx_feedback(
	or multicast. */		or multicast. */
	//CountTxStatistics( pAdapter, &tcb );		//CountTxStatistics( pAdapter, &tcb );

	} /* cmpk_Handle_Tx_Feedback */		}

	static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)		static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)
	{		{
	@@ -445,7 +445,7 @@ cmpk_handle_interrupt_status(

	DMESG("<---- cmpk_handle_interrupt_status()\n");		DMESG("<---- cmpk_handle_interrupt_status()\n");

	} /* cmpk_handle_interrupt_status */		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -493,7 +493,7 @@ cmpk_handle_query_config_rx(
	rx_query_cfg.mask = (pmsg[12] << 24) \| (pmsg[13] << 16) \|		rx_query_cfg.mask = (pmsg[12] << 24) \| (pmsg[13] << 16) \|
	(pmsg[14] << 8) \| (pmsg[15] << 0);		(pmsg[14] << 8) \| (pmsg[15] << 0);

	} /* cmpk_Handle_Query_Config_Rx */		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -559,7 +559,7 @@ static void cmpk_count_tx_status( struct net_device *dev,
	priv->stats.txbytesunicast += pstx_status->txuclength;		priv->stats.txbytesunicast += pstx_status->txuclength;

	priv->stats.last_packet_rate = pstx_status->rate;		priv->stats.last_packet_rate = pstx_status->rate;
	} /* cmpk_CountTxStatus */		}



	@@ -591,7 +591,7 @@ cmpk_handle_tx_status(
	/* 2. Use tx feedback info to count TX statistics. */		/* 2. Use tx feedback info to count TX statistics. */
	cmpk_count_tx_status(dev, &rx_tx_sts);		cmpk_count_tx_status(dev, &rx_tx_sts);

	} /* cmpk_Handle_Tx_Status */		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -671,7 +671,7 @@ cmpk_handle_tx_rate_history(
	priv->stats.txrate.ht_mcs[j][i] += ptxrate->ht_mcs[j][i];		priv->stats.txrate.ht_mcs[j][i] += ptxrate->ht_mcs[j][i];
	}		}

	} /* cmpk_Handle_Tx_Rate_History */		}


	/*-----------------------------------------------------------------------------		/*-----------------------------------------------------------------------------
	@@ -801,4 +801,4 @@ u32 cmpk_message_handle_rx(struct net_device dev, struct ieee80211_rx_stats ps
	return 1; /* This is a command packet. */		return 1; /* This is a command packet. */

	RT_TRACE(COMP_EVENTS, "<----cmpk_message_handle_rx()\n");		RT_TRACE(COMP_EVENTS, "<----cmpk_message_handle_rx()\n");
	} /* CMPK_Message_Handle_Rx */		}

drivers/staging/rtl8192e/r819xE_phy.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1853,7 +1853,7 @@ static u32 phy_FwRFSerialRead(
	return 0;		return 0;
	}		}
	return read_nic_dword(dev, RF_DATA);		return read_nic_dword(dev, RF_DATA);
	} /* phy_FwRFSerialRead */		}

	/******************************************************************************		/******************************************************************************
	*function: We support firmware to execute RF-R/W.		*function: We support firmware to execute RF-R/W.
	@@ -1907,7 +1907,7 @@ phy_FwRFSerialWrite(
	/* 2008/01/17 MH We support delay in firmware side now. */		/* 2008/01/17 MH We support delay in firmware side now. */
	//delay_us(20);		//delay_us(20);

	} /* phy_FwRFSerialWrite */		}


	/******************************************************************************		/******************************************************************************