Merge tag 'pxa-dt-4.7' of https://github.com/rjarzmik/linux into next/dt

[karo-tx-linux.git] / drivers / staging / vt6656 / baseband.c

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 9417c935fc303cfa1f21db815766a03aefab4f64..882fe54ce41d876d700943f11dc305f6c9848630 100644 (file)
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -138,7 +138,7 @@ static const u16 vnt_frame_time[MAX_RATE] = {
  *
  */
 unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type,
-       unsigned int frame_length, u16 tx_rate)
+                               unsigned int frame_length, u16 tx_rate)
 {
        unsigned int frame_time;
        unsigned int preamble;
@@ -195,7 +195,7 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type,
  *
  */
 void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
-       u16 tx_rate, u8 pkt_type, struct vnt_phy_field *phy)
+                      u16 tx_rate, u8 pkt_type, struct vnt_phy_field *phy)
 {
        u32 bit_count;
        u32 count = 0;
@@ -355,7 +355,7 @@ void vnt_set_antenna_mode(struct vnt_private *priv, u8 antenna_mode)
        }
 
        vnt_control_out(priv, MESSAGE_TYPE_SET_ANTMD,
-               (u16)antenna_mode, 0, 0, NULL);
+                       (u16)antenna_mode, 0, 0, NULL);
 }
 
 /*
@@ -383,7 +383,7 @@ int vnt_vt3184_init(struct vnt_private *priv)
        u8 data;
 
        status = vnt_control_in(priv, MESSAGE_TYPE_READ, 0,
-               MESSAGE_REQUEST_EEPROM, EEP_MAX_CONTEXT_SIZE,
+                               MESSAGE_REQUEST_EEPROM, EEP_MAX_CONTEXT_SIZE,
                                                priv->eeprom);
        if (status != STATUS_SUCCESS)
                return false;
@@ -393,7 +393,7 @@ int vnt_vt3184_init(struct vnt_private *priv)
        dev_dbg(&priv->usb->dev, "RF Type %d\n", priv->rf_type);
 
        if ((priv->rf_type == RF_AL2230) ||
-                               (priv->rf_type == RF_AL2230S)) {
+           (priv->rf_type == RF_AL2230S)) {
                priv->bb_rx_conf = vnt_vt3184_al2230[10];
                length = sizeof(vnt_vt3184_al2230);
                addr = vnt_vt3184_al2230;
@@ -457,21 +457,21 @@ int vnt_vt3184_init(struct vnt_private *priv)
        memcpy(array, addr, length);
 
        vnt_control_out(priv, MESSAGE_TYPE_WRITE, 0,
-               MESSAGE_REQUEST_BBREG, length, array);
+                       MESSAGE_REQUEST_BBREG, length, array);
 
        memcpy(array, agc, length_agc);
 
        vnt_control_out(priv, MESSAGE_TYPE_WRITE, 0,
-               MESSAGE_REQUEST_BBAGC, length_agc, array);
+                       MESSAGE_REQUEST_BBAGC, length_agc, array);
 
        if ((priv->rf_type == RF_VT3226) ||
-               (priv->rf_type == RF_VT3342A0)) {
+           (priv->rf_type == RF_VT3342A0)) {
                vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,
-                                               MAC_REG_ITRTMSET, 0x23);
+                                  MAC_REG_ITRTMSET, 0x23);
                vnt_mac_reg_bits_on(priv, MAC_REG_PAPEDELAY, 0x01);
        } else if (priv->rf_type == RF_VT3226D0) {
                vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,
-                                               MAC_REG_ITRTMSET, 0x11);
+                                  MAC_REG_ITRTMSET, 0x11);
                vnt_mac_reg_bits_on(priv, MAC_REG_PAPEDELAY, 0x01);
        }
 
@@ -482,12 +482,12 @@ int vnt_vt3184_init(struct vnt_private *priv)
 
        /* Fix for TX USB resets from vendors driver */
        vnt_control_in(priv, MESSAGE_TYPE_READ, USB_REG4,
-               MESSAGE_REQUEST_MEM, sizeof(data), &data);
+                      MESSAGE_REQUEST_MEM, sizeof(data), &data);
 
        data |= 0x2;
 
        vnt_control_out(priv, MESSAGE_TYPE_WRITE, USB_REG4,
-               MESSAGE_REQUEST_MEM, sizeof(data), &data);
+                       MESSAGE_REQUEST_MEM, sizeof(data), &data);
 
        return true;
 }
@@ -814,7 +814,7 @@ void vnt_update_pre_ed_threshold(struct vnt_private *priv, int scanning)
        priv->bb_pre_ed_index = ed_inx;
 
        dev_dbg(&priv->usb->dev, "%s bb_pre_ed_rssi %d\n",
-                                       __func__, priv->bb_pre_ed_rssi);
+               __func__, priv->bb_pre_ed_rssi);
 
        if (!cr_201 && !cr_206)
                return;