Staging: rtl8187se: cleanup r8180_rtl8225.c

* remove empty rtl8225_host_usb_init()
* remove commented out code
* remove useless comments
* beautify code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.c b/drivers/staging/rtl8187se/r8180_rtl8225.c
index a132f6a36a62999c71c1d0cf09f63de005180204..80ea2c67d11cd99c38d4f2192b416cd34b7e5fdc 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_rtl8225.c
+++ b/drivers/staging/rtl8187se/r8180_rtl8225.c
@@ -16,35 +16,23 @@
 #include "r8180_rtl8225.h"
 
 
-u8 rtl8225_gain[]={
-       0x23,0x88,0x7c,0xa5,// -82dbm
-       0x23,0x88,0x7c,0xb5,// -82dbm
-       0x23,0x88,0x7c,0xc5,// -82dbm
-       0x33,0x80,0x79,0xc5,// -78dbm
-       0x43,0x78,0x76,0xc5,// -74dbm
-       0x53,0x60,0x73,0xc5,// -70dbm
-       0x63,0x58,0x70,0xc5,// -66dbm
+u8 rtl8225_gain[] = {
+       0x23, 0x88, 0x7c, 0xa5, /* -82dBm */
+       0x23, 0x88, 0x7c, 0xb5, /* -82dBm */
+       0x23, 0x88, 0x7c, 0xc5, /* -82dBm */
+       0x33, 0x80, 0x79, 0xc5, /* -78dBm */
+       0x43, 0x78, 0x76, 0xc5, /* -74dBm */
+       0x53, 0x60, 0x73, 0xc5, /* -70dBm */
+       0x63, 0x58, 0x70, 0xc5, /* -66dBm */
 };
 
-u32 rtl8225_chan[] ={
-              0,
-               0x0080, //ch1
-               0x0100, //ch2
-               0x0180, //ch3
-               0x0200, //ch4
-               0x0280,
-               0x0300,
-               0x0380,
-               0x0400,
-               0x0480,
-               0x0500,
-               0x0580,
-               0x0600,
-               0x0680,
-               0x074A, //ch14
+u32 rtl8225_chan[] = {
+       0,
+       0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380,
+       0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x074A,
 };
 
-u16 rtl8225bcd_rxgain[]={
+u16 rtl8225bcd_rxgain[] = {
        0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409,
        0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,
        0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583,
@@ -60,48 +48,51 @@ u16 rtl8225bcd_rxgain[]={
 
 };
 
-u8 rtl8225_agc[]={
-       0x9e,0x9e,0x9e,0x9e,0x9e,0x9e,0x9e,0x9e,0x9d,0x9c,0x9b,0x9a,0x99,0x98,0x97,0x96,
-       0x95,0x94,0x93,0x92,0x91,0x90,0x8f,0x8e,0x8d,0x8c,0x8b,0x8a,0x89,0x88,0x87,0x86,
-       0x85,0x84,0x83,0x82,0x81,0x80,0x3f,0x3e,0x3d,0x3c,0x3b,0x3a,0x39,0x38,0x37,0x36,
-       0x35,0x34,0x33,0x32,0x31,0x30,0x2f,0x2e,0x2d,0x2c,0x2b,0x2a,0x29,0x28,0x27,0x26,
-       0x25,0x24,0x23,0x22,0x21,0x20,0x1f,0x1e,0x1d,0x1c,0x1b,0x1a,0x19,0x18,0x17,0x16,
-       0x15,0x14,0x13,0x12,0x11,0x10,0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08,0x07,0x06,
-       0x05,0x04,0x03,0x02,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
-       0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
+u8 rtl8225_agc[] = {
+       0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e,
+       0x9d, 0x9c, 0x9b, 0x9a, 0x99, 0x98, 0x97, 0x96,
+       0x95, 0x94, 0x93, 0x92, 0x91, 0x90, 0x8f, 0x8e,
+       0x8d, 0x8c, 0x8b, 0x8a, 0x89, 0x88, 0x87, 0x86,
+       0x85, 0x84, 0x83, 0x82, 0x81, 0x80, 0x3f, 0x3e,
+       0x3d, 0x3c, 0x3b, 0x3a, 0x39, 0x38, 0x37, 0x36,
+       0x35, 0x34, 0x33, 0x32, 0x31, 0x30, 0x2f, 0x2e,
+       0x2d, 0x2c, 0x2b, 0x2a, 0x29, 0x28, 0x27, 0x26,
+       0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1f, 0x1e,
+       0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16,
+       0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e,
+       0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06,
+       0x05, 0x04, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01,
+       0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+       0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+       0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
 };
 
-
-u8 rtl8225_tx_gain_cck_ofdm[]={
-       0x02,0x06,0x0e,0x1e,0x3e,0x7e
+u8 rtl8225_tx_gain_cck_ofdm[] = {
+       0x02, 0x06, 0x0e, 0x1e, 0x3e, 0x7e
 };
 
-
-u8 rtl8225_tx_power_ofdm[]={
-       0x80,0x90,0xa2,0xb5,0xcb,0xe4
+u8 rtl8225_tx_power_ofdm[] = {
+       0x80, 0x90, 0xa2, 0xb5, 0xcb, 0xe4
 };
 
-
-u8 rtl8225_tx_power_cck_ch14[]={
-       0x18,0x17,0x15,0x0c,0x00,0x00,0x00,0x00,
-       0x1b,0x1a,0x17,0x0e,0x00,0x00,0x00,0x00,
-       0x1f,0x1e,0x1a,0x0f,0x00,0x00,0x00,0x00,
-       0x22,0x21,0x1d,0x11,0x00,0x00,0x00,0x00,
-       0x26,0x25,0x21,0x13,0x00,0x00,0x00,0x00,
-       0x2b,0x2a,0x25,0x15,0x00,0x00,0x00,0x00
+u8 rtl8225_tx_power_cck_ch14[] = {
+       0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00,
+       0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00,
+       0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00,
+       0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00,
+       0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00,
+       0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00
 };
 
-
-u8 rtl8225_tx_power_cck[]={
-       0x18,0x17,0x15,0x11,0x0c,0x08,0x04,0x02,
-       0x1b,0x1a,0x17,0x13,0x0e,0x09,0x04,0x02,
-       0x1f,0x1e,0x1a,0x15,0x10,0x0a,0x05,0x02,
-       0x22,0x21,0x1d,0x18,0x11,0x0b,0x06,0x02,
-       0x26,0x25,0x21,0x1b,0x14,0x0d,0x06,0x03,
-       0x2b,0x2a,0x25,0x1e,0x16,0x0e,0x07,0x03
+u8 rtl8225_tx_power_cck[] = {
+       0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02,
+       0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02,
+       0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02,
+       0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02,
+       0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03,
+       0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03
 };
 
-
 void rtl8225_set_gain(struct net_device *dev, short gain)
 {
        write_phy_ofdm(dev, 0x0d, rtl8225_gain[gain * 4]);
@@ -113,15 +104,15 @@ void rtl8225_set_gain(struct net_device *dev, short gain)
 void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
 {
        int i;
-       u16 out,select;
+       u16 out, select;
        u8 bit;
        u32 bangdata = (data << 4) | (adr & 0xf);
        struct r8180_priv *priv = ieee80211_priv(dev);
 
        out = read_nic_word(dev, RFPinsOutput) & 0xfff3;
 
-       write_nic_word(dev,RFPinsEnable,
-               (read_nic_word(dev,RFPinsEnable) | 0x7));
+       write_nic_word(dev, RFPinsEnable,
+               (read_nic_word(dev, RFPinsEnable) | 0x7));
 
        select = read_nic_word(dev, RFPinsSelect);
 
@@ -131,7 +122,7 @@ void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
        force_pci_posting(dev);
        udelay(10);
 
-       write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN );//| 0x1fff);
+       write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN);
 
        force_pci_posting(dev);
        udelay(2);
@@ -141,10 +132,8 @@ void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
        force_pci_posting(dev);
        udelay(10);
 
-
-       for(i=15; i>=0;i--){
-
-               bit = (bangdata & (1<<i)) >> i;
+       for (i = 15; i >= 0; i--) {
+               bit = (bangdata & (1 << i)) >> i;
 
                write_nic_word(dev, RFPinsOutput, bit | out);
 
@@ -152,7 +141,7 @@ void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
                write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
 
                i--;
-               bit = (bangdata & (1<<i)) >> i;
+               bit = (bangdata & (1 << i)) >> i;
 
                write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
                write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
@@ -172,7 +161,7 @@ void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
        write_nic_word(dev, RFPinsSelect, select |
                ((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO));
 
-       if(priv->card_type == USB)
+       if (priv->card_type == USB)
                mdelay(2);
        else
                rtl8185_rf_pins_enable(dev);
@@ -181,7 +170,6 @@ void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
 void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch)
 {
        struct r8180_priv *priv = ieee80211_priv(dev);
-
        int GainIdx;
        int GainSetting;
        int i;
@@ -193,36 +181,31 @@ void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch)
        u8 cck_power_level = 0xff & priv->chtxpwr[ch];
        u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdm[ch];
 
-       if(priv->card_type == USB){
+       if (priv->card_type == USB) {
                max_cck_power_level = 11;
-               max_ofdm_power_level = 25; //  12 -> 25
+               max_ofdm_power_level = 25;
                min_ofdm_power_level = 10;
-       }else{
+       } else {
                max_cck_power_level = 35;
                max_ofdm_power_level = 35;
                min_ofdm_power_level = 0;
        }
-       /* CCK power setting */
-       if(cck_power_level > max_cck_power_level)
+
+       if (cck_power_level > max_cck_power_level)
                cck_power_level = max_cck_power_level;
-       GainIdx=cck_power_level % 6;
-       GainSetting=cck_power_level / 6;
 
-       if(ch == 14)
+       GainIdx = cck_power_level % 6;
+       GainSetting = cck_power_level / 6;
+
+       if (ch == 14)
                cck_power_table = rtl8225_tx_power_cck_ch14;
        else
                cck_power_table = rtl8225_tx_power_cck;
 
-//     if(priv->card_8185 == 1 && priv->card_8185_Bversion ){
-               /*Ver B*/
-//             write_nic_byte(dev, TX_GAIN_CCK, rtl8225_tx_gain_cck_ofdm[GainSetting]);
-//     }else{
-               /*Ver C - D */
-       write_nic_byte(dev, TX_GAIN_CCK, rtl8225_tx_gain_cck_ofdm[GainSetting]>>1);
-//     }
-
-       for(i=0;i<8;i++){
+       write_nic_byte(dev, TX_GAIN_CCK,
+                      rtl8225_tx_gain_cck_ofdm[GainSetting] >> 1);
 
+       for (i = 0; i < 8; i++) {
                power = cck_power_table[GainIdx * 8 + i];
                write_phy_cck(dev, 0x44 + i, power);
        }
@@ -231,48 +214,33 @@ void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch)
        force_pci_posting(dev);
        mdelay(1);
 
-       /* OFDM power setting */
-//  Old:
-//     if(ofdm_power_level > max_ofdm_power_level)
-//             ofdm_power_level = 35;
-//     ofdm_power_level += min_ofdm_power_level;
-//  Latest:
-       if(ofdm_power_level > (max_ofdm_power_level - min_ofdm_power_level))
+       if (ofdm_power_level > (max_ofdm_power_level - min_ofdm_power_level))
                ofdm_power_level = max_ofdm_power_level;
        else
                ofdm_power_level += min_ofdm_power_level;
-       if(ofdm_power_level > 35)
+
+       if (ofdm_power_level > 35)
                ofdm_power_level = 35;
-//
-
-       GainIdx=ofdm_power_level % 6;
-       GainSetting=ofdm_power_level / 6;
-#if 1
-//     if(priv->card_type == USB){
-               rtl8185_set_anaparam2(dev,RTL8225_ANAPARAM2_ON);
-
-               write_phy_ofdm(dev,2,0x42);
-               write_phy_ofdm(dev,6,0);
-               write_phy_ofdm(dev,8,0);
-//     }
-#endif
-//     if(priv->card_8185 == 1 && priv->card_8185_Bversion){
-//             /*Ver B*/
-//             write_nic_byte(dev, TX_GAIN_OFDM, rtl8225_tx_gain_cck_ofdm[GainSetting]);
-//     }else{
-               /*Ver C - D */
-       write_nic_byte(dev, TX_GAIN_OFDM, rtl8225_tx_gain_cck_ofdm[GainSetting]>>1);
-//     }
 
+       GainIdx = ofdm_power_level % 6;
+       GainSetting = ofdm_power_level / 6;
+
+       rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
+
+       write_phy_ofdm(dev, 2, 0x42);
+       write_phy_ofdm(dev, 6, 0x00);
+       write_phy_ofdm(dev, 8, 0x00);
+
+       write_nic_byte(dev, TX_GAIN_OFDM,
+                      rtl8225_tx_gain_cck_ofdm[GainSetting] >> 1);
 
        power = rtl8225_tx_power_ofdm[GainIdx];
 
-       write_phy_ofdm(dev, 0x5, power);
-       write_phy_ofdm(dev, 0x7, power);
+       write_phy_ofdm(dev, 5, power);
+       write_phy_ofdm(dev, 7, power);
 
        force_pci_posting(dev);
        mdelay(1);
-       //write_nic_byte(dev, TX_AGC_CONTROL,4);
 }
 
 void rtl8225_rf_set_chan(struct net_device *dev, short ch)
@@ -289,34 +257,27 @@ void rtl8225_rf_set_chan(struct net_device *dev, short ch)
        force_pci_posting(dev);
        mdelay(10);
 
-       // A mode sifs 0x44, difs 34-14, slot 9, eifs 23, cwm 3, cwM 7, ctstoself 0x10
-       if(gset){
-               write_nic_byte(dev,SIFS,0x22);// SIFS: 0x22
-               write_nic_byte(dev,DIFS,0x14); //DIFS: 20
-               //write_nic_byte(dev,DIFS,20); //DIFS: 20
-       }else{
-               write_nic_byte(dev,SIFS,0x44);// SIFS: 0x22
-               write_nic_byte(dev,DIFS,50 - 14); //DIFS: 36
+       if (gset) {
+               write_nic_byte(dev, SIFS, 0x22);
+               write_nic_byte(dev, DIFS, 0x14);
+       } else {
+               write_nic_byte(dev, SIFS, 0x44);
+               write_nic_byte(dev, DIFS, 0x24);
        }
-       if(priv->ieee80211->state == IEEE80211_LINKED &&
-               ieee80211_is_shortslot(priv->ieee80211->current_network))
-               write_nic_byte(dev,SLOT,0x9); //SLOT: 9
 
+       if (priv->ieee80211->state == IEEE80211_LINKED &&
+           ieee80211_is_shortslot(priv->ieee80211->current_network))
+               write_nic_byte(dev, SLOT, 0x9);
        else
-               write_nic_byte(dev,SLOT,0x14); //SLOT: 20 (0x14)
-
-
-       if(gset){
-               write_nic_byte(dev,EIFS,81);//91 - 20); // EIFS: 91 (0x5B)
-               write_nic_byte(dev,CW_VAL,0x73); //CW VALUE: 0x37
-               //DMESG("using G net params");
-       }else{
-               write_nic_byte(dev,EIFS,81); // EIFS: 91 (0x5B)
-               write_nic_byte(dev,CW_VAL,0xa5); //CW VALUE: 0x37
-               //DMESG("using B net params");
+               write_nic_byte(dev, SLOT, 0x14);
+
+       if (gset) {
+               write_nic_byte(dev, EIFS, 81);
+               write_nic_byte(dev, CW_VAL, 0x73);
+       } else {
+               write_nic_byte(dev, EIFS, 81);
+               write_nic_byte(dev, CW_VAL, 0xa5);
        }
-
-
 }
 
 void rtl8225_host_pci_init(struct net_device *dev)
@@ -325,21 +286,13 @@ void rtl8225_host_pci_init(struct net_device *dev)
 
        rtl8185_rf_pins_enable(dev);
 
-       //if(priv->card_8185 == 2 && priv->enable_gpio0 ) /* version D */
-       //write_nic_word(dev, RFPinsSelect, 0x88);
-       //else
-       write_nic_word(dev, RFPinsSelect, 0x88 | SW_CONTROL_GPIO); /* 0x488 | SW_CONTROL_GPIO */
+       write_nic_word(dev, RFPinsSelect, 0x88 | SW_CONTROL_GPIO);
 
        write_nic_byte(dev, GP_ENABLE, 0);
 
        force_pci_posting(dev);
        mdelay(200);
 
-       write_nic_word(dev, GP_ENABLE, 0xff & (~(1<<6))); /* bit 6 is for RF on/off detection */
-
-
-}
-
-void rtl8225_host_usb_init(struct net_device *dev)
-{
+       /* bit 6 is for RF on/off detection */
+       write_nic_word(dev, GP_ENABLE, 0xff & (~(1 << 6)));
 }

diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.h b/drivers/staging/rtl8187se/r8180_rtl8225.h
index cb2773b26595797ff306b78485d1aa9a6ccb84d5..c4b87b31897f94d84d2c4b4aa7923e0caf3a7e3b 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_rtl8225.h
+++ b/drivers/staging/rtl8187se/r8180_rtl8225.h
@@ -24,7 +24,6 @@ void rtl8225z2_rf_set_chan(struct net_device *dev,short ch);
 void rtl8225z2_rf_close(struct net_device *dev);
 
 void rtl8225_host_pci_init(struct net_device *dev);
-void rtl8225_host_usb_init(struct net_device *dev);
 
 void write_rtl8225(struct net_device *dev, u8 adr, u16 data);
 void RF_WriteReg(struct net_device *dev, u8 offset, u32        data);

diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
index 8d18be80a5e6ae4c8cc300509375a8b1c1f6331b..54f2ea7ec6fc7d565b5d40c30405c03592679f4d 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c
+++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
@@ -472,10 +472,7 @@ void rtl8225z2_rf_init(struct net_device *dev)
 
 //     rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
 
-
-       if(priv->card_type == USB)
-               rtl8225_host_usb_init(dev);
-       else
+       if (priv->card_type != USB)
                rtl8225_host_pci_init(dev);
 
        write_nic_dword(dev, RF_TIMING, 0x000a8008);