Commit 703fdcc3 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Make RT_TRACE use consistent 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9f17b076

drivers/staging/rtl8192e/r8192E.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
extern u32 rt_global_debug_component;

#define RT_TRACE(component, x, args...) \

do { if(rt_global_debug_component & component) \

	printk(KERN_DEBUG RTL819xE_MODULE_NAME ":" x "\n" , \

	printk(KERN_DEBUG RTL819xE_MODULE_NAME ":" x , \

	       ##args);\

}while(0);

drivers/staging/rtl8192e/r8192E_core.c

+26 −26
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static int proc_get_stats_rx(char *page, char **start, 


static void rtl8192_proc_module_init(void)

{

	RT_TRACE(COMP_INIT, "Initializing proc filesystem");

	RT_TRACE(COMP_INIT, "Initializing proc filesystem\n");

	rtl8192_proc=create_proc_entry(RTL819xE_MODULE_NAME, S_IFDIR, init_net.proc_net);

}
@@ -1297,7 +1297,7 @@ static short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) 


	pdesc = &ring->desc[idx];

	if ((pdesc->OWN == 1) && (tcb_desc->queue_index != BEACON_QUEUE)) {

		RT_TRACE(COMP_ERR, "No more TX desc@%d, ring->idx = %d,idx = %d,%x",

		RT_TRACE(COMP_ERR, "No more TX desc@%d, ring->idx = %d,idx = %d,%x\n",

			 tcb_desc->queue_index, ring->idx, idx, skb->len);

		spin_unlock_irqrestore(&priv->irq_th_lock, flags);

		return skb->len;
@@ -2160,8 +2160,8 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) 


		ICVer8192 = (IC_Version&0xf);		//bit0~3; 1:A cut, 2:B cut, 3:C cut...

		ICVer8256 = ((IC_Version&0xf0)>>4);//bit4~6, bit7 reserved for other RF chip; 1:A cut, 2:B cut, 3:C cut...

		RT_TRACE(COMP_INIT, "\nICVer8192 = 0x%x\n", ICVer8192);

		RT_TRACE(COMP_INIT, "\nICVer8256 = 0x%x\n", ICVer8256);

		RT_TRACE(COMP_INIT, "ICVer8192 = 0x%x\n", ICVer8192);

		RT_TRACE(COMP_INIT, "ICVer8256 = 0x%x\n", ICVer8256);

		if(ICVer8192 == 0x2)	//B-cut

		{

			if(ICVer8256 == 0x5) //E-cut
@@ -2186,7 +2186,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) 
		priv->eeprom_did = 0;

		priv->eeprom_CustomerID = 0;

		priv->eeprom_ChannelPlan = 0;

		RT_TRACE(COMP_INIT, "\nIC Version = 0x%x\n", 0xff);

		RT_TRACE(COMP_INIT, "IC Version = 0x%x\n", 0xff);

	}



	RT_TRACE(COMP_INIT, "EEPROM VID = 0x%4x\n", priv->eeprom_vid);
@@ -2369,11 +2369,11 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) 


	if(priv->rf_type == RF_1T2R)

	{

		RT_TRACE(COMP_INIT, "\n1T2R config\n");

		RT_TRACE(COMP_INIT, "1T2R config\n");

	}

	else if (priv->rf_type == RF_2T4R)

	{

		RT_TRACE(COMP_INIT, "\n2T4R config\n");

		RT_TRACE(COMP_INIT, "2T4R config\n");

	}



	// 2008/01/16 MH We can only know RF type in the function. So we have to init
@@ -2875,12 +2875,12 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev) 
{

	if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_PS)

	{ // H/W or S/W RF OFF before sleep.

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason);

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d)\n", __FUNCTION__,priv->ieee80211->RfOffReason);

		MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason);

	}

	else if(priv->ieee80211->RfOffReason >= RF_CHANGE_BY_IPS)

	{ // H/W or S/W RF OFF before sleep.

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason);

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d)\n", __FUNCTION__,priv->ieee80211->RfOffReason);

		MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason);

	}

	else
@@ -3507,7 +3507,7 @@ static int _rtl8192_up(struct net_device *dev) 
	priv->up=1;

	priv->ieee80211->ieee_up=1;

	priv->bdisable_nic = false;  //YJ,add,091111

	RT_TRACE(COMP_INIT, "Bringing up iface");

	RT_TRACE(COMP_INIT, "Bringing up iface\n");



	init_status = rtl8192_adapter_start(dev);

	if(init_status != RT_STATUS_SUCCESS)
@@ -3914,7 +3914,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct 
		{

			if (!rtl8192_phy_CheckIsLegalRFPath(priv->ieee80211->dev, rfpath))

				continue;

			RT_TRACE(COMP_DBG,"Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath]  = %d \n" ,pprevious_stats->RxMIMOSignalStrength[rfpath] );

			RT_TRACE(COMP_DBG, "pPreviousstats->RxMIMOSignalStrength[rfpath] = %d\n", pprevious_stats->RxMIMOSignalStrength[rfpath]);

			//Fixed by Jacken 2008-03-20

			if(priv->stats.rx_rssi_percentage[rfpath] == 0)

			{
@@ -3933,7 +3933,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct 
					( (priv->stats.rx_rssi_percentage[rfpath]*(Rx_Smooth_Factor-1)) +

					(pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor);

			}

			RT_TRACE(COMP_DBG,"Jacken -> priv->RxStats.RxRSSIPercentage[rfPath]  = %d \n" ,priv->stats.rx_rssi_percentage[rfpath] );

			RT_TRACE(COMP_DBG, "priv->RxStats.RxRSSIPercentage[rfPath] = %d \n" , priv->stats.rx_rssi_percentage[rfpath]);

		}

	}
@@ -4697,7 +4697,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, 
	int ret = -ENODEV;

	unsigned long pmem_start, pmem_len, pmem_flags;



	RT_TRACE(COMP_INIT,"Configuring chip resources");

	RT_TRACE(COMP_INIT,"Configuring chip resources\n");



	if( pci_enable_device (pdev) ){

		RT_TRACE(COMP_ERR,"Failed to enable PCI device");
@@ -4731,20 +4731,20 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, 
	pmem_flags = pci_resource_flags (pdev, 1);



	if (!(pmem_flags & IORESOURCE_MEM)) {

		RT_TRACE(COMP_ERR,"region #1 not a MMIO resource, aborting");

		RT_TRACE(COMP_ERR, "region #1 not a MMIO resource, aborting\n");

		goto fail;

	}



	//DMESG("Memory mapped space @ 0x%08lx ", pmem_start);

	if( ! request_mem_region(pmem_start, pmem_len, RTL819xE_MODULE_NAME)) {

		RT_TRACE(COMP_ERR,"request_mem_region failed!");

		RT_TRACE(COMP_ERR,"request_mem_region failed!\n");

		goto fail;

	}





	ioaddr = (unsigned long)ioremap_nocache( pmem_start, pmem_len);

	if( ioaddr == (unsigned long)NULL ){

		RT_TRACE(COMP_ERR,"ioremap failed!");

		RT_TRACE(COMP_ERR,"ioremap failed!\n");

	       // release_mem_region( pmem_start, pmem_len );

		goto fail1;

	}
@@ -4778,7 +4778,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, 


	RT_TRACE(COMP_INIT, "Driver probe completed1\n");

	if(rtl8192_init(dev)!=0){

		RT_TRACE(COMP_ERR, "Initialization failed");

		RT_TRACE(COMP_ERR, "Initialization failed\n");

		goto fail;

	}
@@ -4896,7 +4896,7 @@ static int __init rtl8192_pci_module_init(void) 


	printk(KERN_INFO "\nLinux kernel driver for RTL8192 based WLAN cards\n");

	printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan\n");

	RT_TRACE(COMP_INIT, "Initializing module");

	RT_TRACE(COMP_INIT, "Initializing module\n");

	rtl8192_proc_module_init();

      if(0!=pci_register_driver(&rtl8192_pci_driver))

	{
@@ -4912,7 +4912,7 @@ static void __exit rtl8192_pci_module_exit(void) 
{

	pci_unregister_driver(&rtl8192_pci_driver);



	RT_TRACE(COMP_DOWN, "Exiting");

	RT_TRACE(COMP_DOWN, "Exiting\n");

	rtl8192_proc_module_remove();

	ieee80211_rtl_exit();

}

drivers/staging/rtl8192e/r8192E_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int r8192_wx_set_enc(struct net_device *dev, 


	down(&priv->wx_sem);



	RT_TRACE(COMP_SEC, "Setting SW wep key");

	RT_TRACE(COMP_SEC, "Setting SW wep key\n");

	ret = ieee80211_wx_set_encode(priv->ieee80211,info,wrqu,key);



	up(&priv->wx_sem);

drivers/staging/rtl8192e/r8192_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int rtl8192E_resume (struct pci_dev *pdev) 
	int err;

	u32 val;



        RT_TRACE(COMP_POWER, "================>r8192E resume call.");

        RT_TRACE(COMP_POWER, "================>r8192E resume call.\n");



	pci_set_power_state(pdev, PCI_D0);

drivers/staging/rtl8192e/r819xE_phy.c

+11 −11
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ RT_STATUS rtl8192_phy_checkBBAndRF(struct net_device* dev, HW90_BLOCK_E CheckBlo 
		switch(CheckBlock)

		{

		case HW90_BLOCK_MAC:

			RT_TRACE(COMP_ERR, "PHY_CheckBBRFOK(): Never Write 0x100 here!");

			RT_TRACE(COMP_ERR, "PHY_CheckBBRFOK(): Never Write 0x100 here!\n");

			break;



		case HW90_BLOCK_PHY0:
@@ -1888,20 +1888,20 @@ u8 rtl8192_phy_SwChnl(struct net_device* dev, u8 channel) 
	case WIRELESS_MODE_A:

	case WIRELESS_MODE_N_5G:

		if (channel<=14){

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_A but channel<=14");

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_A but channel<=14\n");

			return false;

		}

		break;

	case WIRELESS_MODE_B:

		if (channel>14){

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_B but channel>14");

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_B but channel>14\n");

			return false;

		}

		break;

	case WIRELESS_MODE_G:

	case WIRELESS_MODE_N_24G:

		if (channel>14){

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_G but channel>14");

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_G but channel>14\n");

			return false;

		}

		break;
@@ -2141,7 +2141,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) 
	atomic_dec(&(priv->ieee80211->atm_swbw));

	priv->SetBWModeInProgress= false;



	RT_TRACE(COMP_SWBW, "<==SetBWMode819xUsb()");

	RT_TRACE(COMP_SWBW, "<==SetBWMode819xUsb()\n");

}



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

drivers/staging/rtl8192e/r8192E_dm.c

+4 −4

File changed.

Contains only whitespace changes.