Staging: agnx: Fixup phy.c checkpatch warnings

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/agnx/phy.c b/drivers/staging/agnx/phy.c
index da8f10c083820aa346302601ad3b903a3d2fc542..2be63312b7279ab8f8d4c125c9a82f265a9a6210 100644 (file)
--- a/drivers/staging/agnx/phy.c
+++ b/drivers/staging/agnx/phy.c
@@ -114,7 +114,7 @@ static void mac_address_set(struct agnx_priv *priv)
        /* FIXME */
        reg = (mac_addr[0] << 24) | (mac_addr[1] << 16) | mac_addr[2] << 8 | mac_addr[3];
        iowrite32(reg, ctl + AGNX_RXM_MACHI);
-       reg = (mac_addr[4] << 8) | mac_addr[5];
+       reg = (mac_addr[4] << 8) | mac_addr[5];
        iowrite32(reg, ctl + AGNX_RXM_MACLO);
 }
 
@@ -127,7 +127,7 @@ static void receiver_bssid_set(struct agnx_priv *priv, u8 *bssid)
        /* FIXME */
        reg = bssid[0] << 24 | (bssid[1] << 16) | (bssid[2] << 8) | bssid[3];
        iowrite32(reg, ctl + AGNX_RXM_BSSIDHI);
-       reg = (bssid[4] << 8) | bssid[5];
+       reg = (bssid[4] << 8) | bssid[5];
        iowrite32(reg, ctl + AGNX_RXM_BSSIDLO);
 
        /* Enable the receiver */
@@ -401,9 +401,9 @@ static void rx_management_init(struct agnx_priv *priv)
                agnx_write32(ctl, 0x2074, 0x1f171710);
                agnx_write32(ctl, 0x2078, 0x10100d0d);
                agnx_write32(ctl, 0x207c, 0x11111010);
-       }
-       else
+       } else {
                agnx_write32(ctl, AGNX_RXM_DELAY11, 0x0);
+       }
        agnx_write32(ctl, AGNX_RXM_REQRATE, 0x8195e00);
 }
 
@@ -476,7 +476,7 @@ static void gain_ctlcnt_init(struct agnx_priv *priv)
        /* It seemed if we set other bit to 1 the bit 0 will
           be auto change to 0 */
        agnx_write32(ctl, AGNX_BM_TXTOPEER, 0x2 | 0x1);
-//     agnx_write32(ctl, AGNX_BM_TXTOPEER, 0x1);
+/*     agnx_write32(ctl, AGNX_BM_TXTOPEER, 0x1); */
 } /* gain_ctlcnt_init */
 
 
@@ -490,7 +490,7 @@ static void phy_init(struct agnx_priv *priv)
        /* Load InitialGainTable */
        gain_table_init(priv);
 
-       agnx_write32(ctl, AGNX_CIR_ADDRWIN, 0x2000000);
+       agnx_write32(ctl, AGNX_CIR_ADDRWIN, 0x2000000);
 
        /* Clear the following offsets in Memory Range #2: */
        memset_io(data + 0x5040, 0, 0xa * 4);
@@ -586,7 +586,7 @@ static void phy_init(struct agnx_priv *priv)
                agnx_write32(ctl, AGNX_GCR_SIFST11B, 0x28);
                agnx_write32(ctl, AGNX_GCR_CWDETEC, 0x0);
                agnx_write32(ctl, AGNX_GCR_0X38, 0x1e);
-//             agnx_write32(ctl, AGNX_GCR_BOACT, 0x26);
+/*             agnx_write32(ctl, AGNX_GCR_BOACT, 0x26);*/
                agnx_write32(ctl, AGNX_GCR_DISCOVMOD, 0x3);
 
                agnx_write32(ctl, AGNX_GCR_THCAP11A, 0x32);
@@ -810,10 +810,10 @@ static void card_interface_init(struct agnx_priv *priv)
                }
                print_hex_dump_bytes(PFX "EEPROM: ", DUMP_PREFIX_NONE, eeprom,
                                     ARRAY_SIZE(eeprom));
-       } while(0);
+       } while (0);
 
        spi_rc_write(ctl, RF_CHIP0, 0x26);
-        reg = agnx_read32(ctl, AGNX_SPI_RLSW);
+       reg = agnx_read32(ctl, AGNX_SPI_RLSW);
 
        /* Initialize the system interface */
        system_itf_init(priv);
@@ -874,19 +874,19 @@ static void card_interface_init(struct agnx_priv *priv)
        /* FIXME Enable the request */
        /* Check packet length */
        /* Set maximum packet length */
-/*     agnx_write32(ctl, AGNX_RXM_REQRATE, 0x88195e00); */
-/*     enable_receiver(priv); */
+/*     agnx_write32(ctl, AGNX_RXM_REQRATE, 0x88195e00); */
+/*     enable_receiver(priv); */
 
        /* Set the Receiver BSSID */
        receiver_bssid_set(priv, bssid);
 
        /* FIXME Set to managed mode */
        set_managed_mode(priv);
-//     set_promiscuous_mode(priv);
-/*     set_scan_mode(priv); */
-/*     set_learn_mode(priv); */
-//     set_promis_and_managed(priv);
-//     set_adhoc_mode(priv);
+/*     set_promiscuous_mode(priv); */
+/*     set_scan_mode(priv); */
+/*     set_learn_mode(priv); */
+/*     set_promis_and_managed(priv); */
+/*     set_adhoc_mode(priv); */
 
        /* Set the recieve request rate */
        /* Check packet length */