2014-07-14 19:16:08

by Peter Senna Tschudin

[permalink] [raw]
Subject: [PATCH V4 1/6] staging: vt6556: Cleanup trivial coding style issues

This patch cleans up the following checkpatch issues:
- tabs instead of spaces on the beginning of a line
- use correct /* */ comment style
- put { and } on the correct places
- line over 80 chars
- indentation style for multi-line calls / comments
- space after semicolon ,
- new line after declaration

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <[email protected]>
---
Cahnges from V3:
- Splitted the patches by change type

drivers/staging/vt6656/baseband.c | 23 ++++++++-------
drivers/staging/vt6656/card.c | 13 +++++----
drivers/staging/vt6656/card.h | 6 ++--
drivers/staging/vt6656/channel.c | 5 ++--
drivers/staging/vt6656/device.h | 10 +++----
drivers/staging/vt6656/main_usb.c | 59 ++++++++++++++++++++-------------------
6 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index c1675d5..8678b41 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -26,9 +26,10 @@
* Date: Jun. 5, 2002
*
* Functions:
- * vnt_get_frame_time - Calculate data frame transmitting time
- * vnt_get_phy_field - Calculate PhyLength, PhyService and Phy Signal parameter for baseband Tx
- * BBbVT3184Init - VIA VT3184 baseband chip init code
+ * vnt_get_frame_time - Calculate data frame transmitting time
+ * vnt_get_phy_field - Calculate PhyLength, PhyService and Phy
+ * Signal parameter for baseband Tx
+ * BBbVT3184Init - VIA VT3184 baseband chip init code
*
* Revision History:
*
@@ -86,7 +87,7 @@ static u8 vnt_vt3184_al2230[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* 0xff */
};

-//{{RobertYu:20060515, new BB setting for VT3226D0
+/* {{RobertYu:20060515, new BB setting for VT3226D0 */
static u8 vnt_vt3184_vt3226d0[] = {
0x31, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
0x70, 0x45, 0x2a, 0x76, 0x00, 0x00, 0x80, 0x00, /* 0x0f */
@@ -122,8 +123,9 @@ static u8 vnt_vt3184_vt3226d0[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* 0xff */
};

-static const u16 awcFrameTime[MAX_RATE] =
-{10, 20, 55, 110, 24, 36, 48, 72, 96, 144, 192, 216};
+static const u16 awcFrameTime[MAX_RATE] = {
+ 10, 20, 55, 110, 24, 36, 48, 72, 96, 144, 192, 216
+};

/*
* Description: Calculate data frame transmitting time
@@ -191,9 +193,9 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type,
* tx_rate - Tx Rate
* Out:
* struct vnt_phy_field *phy
- * - pointer to Phy Length field
- * - pointer to Phy Service field
- * - pointer to Phy Signal field
+ * - pointer to Phy Length field
+ * - pointer to Phy Service field
+ * - pointer to Phy Signal field
*
* Return Value: none
*
@@ -467,7 +469,8 @@ int BBbVT3184Init(struct vnt_private *priv)
priv->ldBmThreshold[2] = 0;
priv->ldBmThreshold[3] = 0;
/* Fix VT3226 DFC system timing issue */
- vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);
+ vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2,
+ SOFTPWRCTL_RFLEOPT);
} else {
return true;
}
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index ea06b63..37cd96b 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -55,11 +55,12 @@
#include "key.h"
#include "usbpipe.h"

-//const u16 cwRXBCNTSFOff[MAX_RATE] =
-//{17, 34, 96, 192, 34, 23, 17, 11, 8, 5, 4, 3};
+/* const u16 cwRXBCNTSFOff[MAX_RATE] =
+ {17, 34, 96, 192, 34, 23, 17, 11, 8, 5, 4, 3}; */

-static const u16 cwRXBCNTSFOff[MAX_RATE] =
-{192, 96, 34, 17, 34, 23, 17, 11, 8, 5, 4, 3};
+static const u16 cwRXBCNTSFOff[MAX_RATE] = {
+ 192, 96, 34, 17, 34, 23, 17, 11, 8, 5, 4, 3
+};

/*
* Description: Set NIC media channel
@@ -477,7 +478,7 @@ void vnt_update_top_rates(struct vnt_private *priv)
}

priv->byTopCCKBasicRate = top_cck;
- }
+}

int vnt_ofdm_min_rate(struct vnt_private *priv)
{
@@ -710,7 +711,7 @@ void vnt_update_next_tbtt(struct vnt_private *priv, u64 tsf,
data[7] = (u8)(tsf >> 56);

vnt_control_out(priv, MESSAGE_TYPE_SET_TSFTBTT,
- MESSAGE_REQUEST_TBTT, 0, 8, data);
+ MESSAGE_REQUEST_TBTT, 0, 8, data);

dev_dbg(&priv->usb->dev, "%s TBTT: %8llx\n", __func__, tsf);

diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 5b7cc5a..80fcd53 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -39,9 +39,9 @@ typedef enum _CARD_PHY_TYPE {
PHY_TYPE_11A
} CARD_PHY_TYPE, *PCARD_PHY_TYPE;

-#define CB_MAX_CHANNEL_24G 14
-#define CB_MAX_CHANNEL_5G 42 /* add channel9(5045MHz), 41==>42 */
-#define CB_MAX_CHANNEL (CB_MAX_CHANNEL_24G+CB_MAX_CHANNEL_5G)
+#define CB_MAX_CHANNEL_24G 14
+#define CB_MAX_CHANNEL_5G 42 /* add channel9(5045MHz), 41==>42 */
+#define CB_MAX_CHANNEL (CB_MAX_CHANNEL_24G + CB_MAX_CHANNEL_5G)

struct vnt_private;

diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index fb1838e..4a53f1a 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -28,8 +28,9 @@
*
*
* Revision History:
- * 01-18-2005 RobertYu: remove the for loop searching in ChannelValid,
- * change ChannelRuleTab to lookup-type, reorder table items.
+ * 01-18-2005 RobertYu: remove the for loop searching in
+ * ChannelValid, change ChannelRuleTab
+ * to lookup-type, reorder table items.
*
*
*/
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 789c55d..50a6749 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -443,11 +443,11 @@ struct vnt_private {
struct ieee80211_low_level_stats low_stats;
};

-#define ADD_ONE_WITH_WRAP_AROUND(uVar, uModulo) { \
- if ((uVar) >= ((uModulo) - 1)) \
- (uVar) = 0; \
- else \
- (uVar)++; \
+#define ADD_ONE_WITH_WRAP_AROUND(uVar, uModulo) { \
+ if ((uVar) >= ((uModulo) - 1)) \
+ (uVar) = 0; \
+ else \
+ (uVar)++; \
}

#define fMP_DISCONNECTED 0x00000002
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 4cdf29e..8e05f04 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -62,7 +62,7 @@
#include "int.h"

/* static int msglevel = MSG_LEVEL_DEBUG; */
-static int msglevel =MSG_LEVEL_INFO;
+static int msglevel = MSG_LEVEL_INFO;

/*
* define module options
@@ -75,18 +75,18 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION(DEVICE_FULL_DRV_NAM);

-#define DEVICE_PARAM(N,D) \
- static int N[MAX_UINTS]=OPTION_DEFAULT;\
- module_param_array(N, int, NULL, 0);\
- MODULE_PARM_DESC(N, D);
+#define DEVICE_PARAM(N, D) \
+ static int N[MAX_UINTS] = OPTION_DEFAULT; \
+ module_param_array(N, int, NULL, 0); \
+ MODULE_PARM_DESC(N, D)

-#define RX_DESC_DEF0 64
-DEVICE_PARAM(RxDescriptors0,"Number of receive usb desc buffer");
+#define RX_DESC_DEF0 64
+DEVICE_PARAM(RxDescriptors0, "Number of receive usb desc buffer");

-#define TX_DESC_DEF0 64
-DEVICE_PARAM(TxDescriptors0,"Number of transmit usb desc buffer");
+#define TX_DESC_DEF0 64
+DEVICE_PARAM(TxDescriptors0, "Number of transmit usb desc buffer");

-#define CHANNEL_DEF 6
+#define CHANNEL_DEF 6
DEVICE_PARAM(Channel, "Channel number");

/* PreambleType[] is the preamble length used for transmit.
@@ -177,13 +177,12 @@ static struct usb_device_id vt6656_table[] = {
/* frequency list (map channels to frequencies) */
/*
static const long frequency_list[] = {
- 2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
- 4915, 4920, 4925, 4935, 4940, 4945, 4960, 4980,
- 5035, 5040, 5045, 5055, 5060, 5080, 5170, 5180, 5190, 5200, 5210, 5220, 5230, 5240,
- 5260, 5280, 5300, 5320, 5500, 5520, 5540, 5560, 5580, 5600, 5620, 5640, 5660, 5680,
- 5700, 5745, 5765, 5785, 5805, 5825
- };
-
+ 2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467,
+ 2472, 2484, 4915, 4920, 4925, 4935, 4940, 4945, 4960, 4980, 5035, 5040,
+ 5045, 5055, 5060, 5080, 5170, 5180, 5190, 5200, 5210, 5220, 5230, 5240,
+ 5260, 5280, 5300, 5320, 5500, 5520, 5540, 5560, 5580, 5600, 5620, 5640,
+ 5660, 5680, 5700, 5745, 5765, 5785, 5805, 5825
+};
*/

static int vt6656_probe(struct usb_interface *intf,
@@ -206,16 +205,16 @@ static void usb_device_reset(struct vnt_private *pDevice);

static void
device_set_options(struct vnt_private *pDevice) {
- pDevice->cbTD = TX_DESC_DEF0;
- pDevice->cbRD = RX_DESC_DEF0;
- pDevice->byShortRetryLimit = SHORT_RETRY_DEF;
- pDevice->byLongRetryLimit = LONG_RETRY_DEF;
- pDevice->op_mode = NL80211_IFTYPE_UNSPECIFIED;
- pDevice->byBBType = BBP_TYPE_DEF;
- pDevice->byPacketType = pDevice->byBBType;
- pDevice->byAutoFBCtrl = AUTO_FB_0;
- pDevice->byPreambleType = 0;
- pDevice->bExistSWNetAddr = false;
+ pDevice->cbTD = TX_DESC_DEF0;
+ pDevice->cbRD = RX_DESC_DEF0;
+ pDevice->byShortRetryLimit = SHORT_RETRY_DEF;
+ pDevice->byLongRetryLimit = LONG_RETRY_DEF;
+ pDevice->op_mode = NL80211_IFTYPE_UNSPECIFIED;
+ pDevice->byBBType = BBP_TYPE_DEF;
+ pDevice->byPacketType = pDevice->byBBType;
+ pDevice->byAutoFBCtrl = AUTO_FB_0;
+ pDevice->byPreambleType = 0;
+ pDevice->bExistSWNetAddr = false;
}

/*
@@ -526,8 +525,9 @@ static void device_free_rx_bufs(struct vnt_private *priv)

static void usb_device_reset(struct vnt_private *pDevice)
{
- int status;
- status = usb_reset_device(pDevice->usb);
+ int status;
+
+ status = usb_reset_device(pDevice->usb);
if (status)
printk("usb_device_reset fail status=%d\n",status);
return ;
@@ -836,6 +836,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
u32 changed)
{
struct vnt_private *priv = hw->priv;
+
priv->current_aid = conf->aid;

if (changed & BSS_CHANGED_BSSID)
--
1.9.3


2014-07-14 19:16:16

by Peter Senna Tschudin

[permalink] [raw]
Subject: [PATCH V4 4/6] staging: vt6556: Remove typedefs

This patch removes uneeded typedefs reported by chackpatch and removes
one enum. The removed enum from card.h:

typedef enum _CARD_PHY_TYPE {
PHY_TYPE_AUTO = 0,
PHY_TYPE_11B,
PHY_TYPE_11G,
PHY_TYPE_11A
} CARD_PHY_TYPE, *PCARD_PHY_TYPE;

The following typedefs were removed, but enums were kept at device.h:

typedef enum __device_msg_level
typedef enum __DEVICE_NDIS_STATUS

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <[email protected]>
---
Cahnges from V3:
- Splitted the patches by change type

drivers/staging/vt6656/card.h | 7 -------
drivers/staging/vt6656/device.h | 17 ++++++++---------
2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 80fcd53..03fc167 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -32,13 +32,6 @@

/* init card type */

-typedef enum _CARD_PHY_TYPE {
- PHY_TYPE_AUTO = 0,
- PHY_TYPE_11B,
- PHY_TYPE_11G,
- PHY_TYPE_11A
-} CARD_PHY_TYPE, *PCARD_PHY_TYPE;
-
#define CB_MAX_CHANNEL_24G 14
#define CB_MAX_CHANNEL_5G 42 /* add channel9(5045MHz), 41==>42 */
#define CB_MAX_CHANNEL (CB_MAX_CHANNEL_24G + CB_MAX_CHANNEL_5G)
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 50a6749..e3acf2f 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -187,13 +187,13 @@

#define DBG_PRT(l, p, args...) { if (l <= msglevel) printk(p, ##args); }

-typedef enum __device_msg_level {
+enum {
MSG_LEVEL_ERR = 0, /* Errors causing abnormal operation */
MSG_LEVEL_NOTICE = 1, /* Errors needing user notification */
MSG_LEVEL_INFO = 2, /* Normal message. */
MSG_LEVEL_VERBOSE = 3, /* Will report all trival errors. */
MSG_LEVEL_DEBUG = 4 /* Only for debug purpose. */
-} DEVICE_MSG_LEVEL, *PDEVICE_MSG_LEVEL;
+};

#define DEVICE_INIT_COLD 0x0 /* cold init */
#define DEVICE_INIT_RESET 0x1 /* reset init or Dx to D0 power remain */
@@ -268,13 +268,12 @@ struct vnt_interrupt_buffer {

/*++ NDIS related */

-typedef enum __DEVICE_NDIS_STATUS {
- STATUS_SUCCESS = 0,
- STATUS_FAILURE,
- STATUS_RESOURCES,
- STATUS_PENDING,
-} DEVICE_NDIS_STATUS, *PDEVICE_NDIS_STATUS;
-
+enum {
+ STATUS_SUCCESS = 0,
+ STATUS_FAILURE,
+ STATUS_RESOURCES,
+ STATUS_PENDING,
+};

/* flags for options */
#define DEVICE_FLAGS_UNPLUG 0x00000001UL
--
1.9.3

2014-07-14 19:16:27

by Peter Senna Tschudin

[permalink] [raw]
Subject: [PATCH V4 6/6] staging: vt6556: Replace printk by pr_warn

This patch fixes a checkpatch warning by replacing printk by pr_warn.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <[email protected]>
---
Cahnges from V3:
- Splitted the patches by change type

drivers/staging/vt6656/main_usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index cc0281a..64c25e2 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -527,7 +527,7 @@ static void usb_device_reset(struct vnt_private *pDevice)

status = usb_reset_device(pDevice->usb);
if (status)
- printk("usb_device_reset fail status=%d\n",status);
+ pr_warn("usb_device_reset fail status=%d\n", status);
}

static void device_free_int_bufs(struct vnt_private *priv)
--
1.9.3

2014-07-14 19:16:33

by Peter Senna Tschudin

[permalink] [raw]
Subject: [PATCH V4 5/6] staging: vt6556: Cleanup indentation on statements

Use tabs instead of spaces in a set of statements and fix lines
over 80 chars. Reported by checkpatch.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <[email protected]>
---
Cahnges from V3:
- Splitted the patches by change type

drivers/staging/vt6656/main_usb.c | 44 ++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 553a8e9..cc0281a 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -382,38 +382,40 @@ static int device_init_registers(struct vnt_private *pDevice)
/* load vt3266 calibration parameters in EEPROM */
if (pDevice->byRFType == RF_VT3226D0) {
if ((pDevice->abyEEPROM[EEP_OFS_MAJOR_VER] == 0x1) &&
- (pDevice->abyEEPROM[EEP_OFS_MINOR_VER] >= 0x4)) {
+ (pDevice->abyEEPROM[EEP_OFS_MINOR_VER] >= 0x4)) {

byCalibTXIQ = pDevice->abyEEPROM[EEP_OFS_CALIB_TX_IQ];
byCalibTXDC = pDevice->abyEEPROM[EEP_OFS_CALIB_TX_DC];
byCalibRXIQ = pDevice->abyEEPROM[EEP_OFS_CALIB_RX_IQ];
if (byCalibTXIQ || byCalibTXDC || byCalibRXIQ) {
- /* CR255, enable TX/RX IQ and DC compensation mode */
+ /* CR255, enable TX/RX IQ and
+ DC compensation mode */
vnt_control_out_u8(pDevice,
- MESSAGE_REQUEST_BBREG,
- 0xff,
- 0x03);
- /* CR251, TX I/Q Imbalance Calibration */
+ MESSAGE_REQUEST_BBREG,
+ 0xff,
+ 0x03);
+ /* CR251, TX I/Q Imbalance Calibration */
vnt_control_out_u8(pDevice,
- MESSAGE_REQUEST_BBREG,
- 0xfb,
- byCalibTXIQ);
- /* CR252, TX DC-Offset Calibration */
+ MESSAGE_REQUEST_BBREG,
+ 0xfb,
+ byCalibTXIQ);
+ /* CR252, TX DC-Offset Calibration */
vnt_control_out_u8(pDevice,
- MESSAGE_REQUEST_BBREG,
- 0xfC,
- byCalibTXDC);
- /* CR253, RX I/Q Imbalance Calibration */
+ MESSAGE_REQUEST_BBREG,
+ 0xfC,
+ byCalibTXDC);
+ /* CR253, RX I/Q Imbalance Calibration */
vnt_control_out_u8(pDevice,
- MESSAGE_REQUEST_BBREG,
- 0xfd,
- byCalibRXIQ);
+ MESSAGE_REQUEST_BBREG,
+ 0xfd,
+ byCalibRXIQ);
} else {
- /* CR255, turn off BB Calibration compensation */
+ /* CR255, turn off
+ BB Calibration compensation */
vnt_control_out_u8(pDevice,
- MESSAGE_REQUEST_BBREG,
- 0xff,
- 0x0);
+ MESSAGE_REQUEST_BBREG,
+ 0xff,
+ 0x0);
}
}
}
--
1.9.3

2014-07-14 19:16:40

by Peter Senna Tschudin

[permalink] [raw]
Subject: [PATCH V4 3/6] staging: vt6556: Remove uneeded return statements

This patch remove uneeded return statements reported by checkpatch
and fixes the indentation of a multi-line call.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <[email protected]>
---
Cahnges from V3:
- Splitted the patches by change type

drivers/staging/vt6656/card.c | 6 +-----
drivers/staging/vt6656/main_usb.c | 13 -------------
2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 37cd96b..f469d68 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -674,9 +674,7 @@ void vnt_reset_next_tbtt(struct vnt_private *priv, u16 beacon_interval)
data[7] = (u8)(next_tbtt >> 56);

vnt_control_out(priv, MESSAGE_TYPE_SET_TSFTBTT,
- MESSAGE_REQUEST_TBTT, 0, 8, data);
-
- return;
+ MESSAGE_REQUEST_TBTT, 0, 8, data);
}

/*
@@ -714,8 +712,6 @@ void vnt_update_next_tbtt(struct vnt_private *priv, u64 tsf,
MESSAGE_REQUEST_TBTT, 0, 8, data);

dev_dbg(&priv->usb->dev, "%s TBTT: %8llx\n", __func__, tsf);
-
- return;
}

/*
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 8e05f04..553a8e9 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -493,8 +493,6 @@ static void device_free_tx_bufs(struct vnt_private *priv)

kfree(tx_context);
}
-
- return;
}

static void device_free_rx_bufs(struct vnt_private *priv)
@@ -519,8 +517,6 @@ static void device_free_rx_bufs(struct vnt_private *priv)

kfree(rcb);
}
-
- return;
}

static void usb_device_reset(struct vnt_private *pDevice)
@@ -530,14 +526,11 @@ static void usb_device_reset(struct vnt_private *pDevice)
status = usb_reset_device(pDevice->usb);
if (status)
printk("usb_device_reset fail status=%d\n",status);
- return ;
}

static void device_free_int_bufs(struct vnt_private *priv)
{
kfree(priv->int_buf.data_buf);
-
- return;
}

static bool device_alloc_bufs(struct vnt_private *priv)
@@ -718,8 +711,6 @@ static void vnt_stop(struct ieee80211_hw *hw)

usb_kill_urb(priv->pInterruptURB);
usb_free_urb(priv->pInterruptURB);
-
- return;
}

static int vnt_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
@@ -785,8 +776,6 @@ static void vnt_remove_interface(struct ieee80211_hw *hw,

/* LED slow blink */
vnt_mac_set_led(priv, LEDSTS_STS, LEDSTS_SLOW);
-
- return;
}

static int vnt_config(struct ieee80211_hw *hw, u32 changed)
@@ -966,8 +955,6 @@ static void vnt_configure(struct ieee80211_hw *hw,
vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG, MAC_REG_RCR, rx_mode);

dev_dbg(&priv->usb->dev, "rx mode out= %x\n", rx_mode);
-
- return;
}

static int vnt_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
--
1.9.3

2014-07-14 19:17:29

by Peter Senna Tschudin

[permalink] [raw]
Subject: [PATCH V4 2/6] staging: vt6556: Remove double parentheses

This patch cleanup a checkpatch warning by removing double parentheses
from if condition. Additionally it fixes a line over 80 chars.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <[email protected]>
---
Cahnges from V3:
- Splitted the patches by change type

drivers/staging/vt6656/baseband.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 8678b41..040b232 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -452,8 +452,9 @@ int BBbVT3184Init(struct vnt_private *priv)
priv->ldBmThreshold[2] = 0;
priv->ldBmThreshold[3] = 0;
/* Fix VT3226 DFC system timing issue */
- vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);
- } else if ((priv->byRFType == RF_VT3342A0)) {
+ vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2,
+ SOFTPWRCTL_RFLEOPT);
+ } else if (priv->byRFType == RF_VT3342A0) {
priv->byBBRxConf = vnt_vt3184_vt3226d0[10];
length = sizeof(vnt_vt3184_vt3226d0);
addr = vnt_vt3184_vt3226d0;
--
1.9.3

2014-07-15 15:04:53

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH V4 1/6] staging: vt6556: Cleanup trivial coding style issues

On Mon, Jul 14, 2014 at 09:15:28PM +0200, Peter Senna Tschudin wrote:
> This patch cleans up the following checkpatch issues:
> - tabs instead of spaces on the beginning of a line
> - use correct /* */ comment style
> - put { and } on the correct places
> - line over 80 chars
> - indentation style for multi-line calls / comments
> - space after semicolon ,
> - new line after declaration
>
> Tested by compilation only.
>
> Signed-off-by: Peter Senna Tschudin <[email protected]>
> ---
> Cahnges from V3:
> - Splitted the patches by change type

That's a lot of things to be doing all in one single patch, why didn't
you split this up further?

Please do so.

thanks,

greg k-h

2014-07-15 15:06:33

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH V4 4/6] staging: vt6556: Remove typedefs

On Mon, Jul 14, 2014 at 09:15:31PM +0200, Peter Senna Tschudin wrote:
> This patch removes uneeded typedefs reported by chackpatch and removes
> one enum. The removed enum from card.h:
>
> typedef enum _CARD_PHY_TYPE {
> PHY_TYPE_AUTO = 0,
> PHY_TYPE_11B,
> PHY_TYPE_11G,
> PHY_TYPE_11A
> } CARD_PHY_TYPE, *PCARD_PHY_TYPE;

Why did you remove this?

2014-07-15 15:07:06

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH V4 6/6] staging: vt6556: Replace printk by pr_warn

On Mon, Jul 14, 2014 at 09:15:33PM +0200, Peter Senna Tschudin wrote:
> This patch fixes a checkpatch warning by replacing printk by pr_warn.
>
> Tested by compilation only.
>
> Signed-off-by: Peter Senna Tschudin <[email protected]>
> ---
> Cahnges from V3:
> - Splitted the patches by change type
>
> drivers/staging/vt6656/main_usb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
> index cc0281a..64c25e2 100644
> --- a/drivers/staging/vt6656/main_usb.c
> +++ b/drivers/staging/vt6656/main_usb.c
> @@ -527,7 +527,7 @@ static void usb_device_reset(struct vnt_private *pDevice)
>
> status = usb_reset_device(pDevice->usb);
> if (status)
> - printk("usb_device_reset fail status=%d\n",status);
> + pr_warn("usb_device_reset fail status=%d\n", status);

Please use dev_warn() instead.

thanks,

greg k-h

2014-07-15 15:08:01

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH V4 5/6] staging: vt6556: Cleanup indentation on statements

On Mon, Jul 14, 2014 at 09:15:32PM +0200, Peter Senna Tschudin wrote:
> Use tabs instead of spaces in a set of statements and fix lines
> over 80 chars. Reported by checkpatch.
>
> Tested by compilation only.
>
> Signed-off-by: Peter Senna Tschudin <[email protected]>
> ---
> Cahnges from V3:
> - Splitted the patches by change type
>
> drivers/staging/vt6656/main_usb.c | 44 ++++++++++++++++++++-------------------
> 1 file changed, 23 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
> index 553a8e9..cc0281a 100644
> --- a/drivers/staging/vt6656/main_usb.c
> +++ b/drivers/staging/vt6656/main_usb.c
> @@ -382,38 +382,40 @@ static int device_init_registers(struct vnt_private *pDevice)
> /* load vt3266 calibration parameters in EEPROM */
> if (pDevice->byRFType == RF_VT3226D0) {
> if ((pDevice->abyEEPROM[EEP_OFS_MAJOR_VER] == 0x1) &&
> - (pDevice->abyEEPROM[EEP_OFS_MINOR_VER] >= 0x4)) {
> + (pDevice->abyEEPROM[EEP_OFS_MINOR_VER] >= 0x4)) {

Shouldn't this be indented by 1 more space?

thanks,

greg k-h

2014-07-15 20:05:59

by Peter Senna Tschudin

[permalink] [raw]
Subject: Re: [PATCH V4 4/6] staging: vt6556: Remove typedefs

On Tue, Jul 15, 2014 at 5:06 PM, Greg KH <[email protected]> wrote:
> On Mon, Jul 14, 2014 at 09:15:31PM +0200, Peter Senna Tschudin wrote:
>> This patch removes uneeded typedefs reported by chackpatch and removes
>> one enum. The removed enum from card.h:
>>
>> typedef enum _CARD_PHY_TYPE {
>> PHY_TYPE_AUTO = 0,
>> PHY_TYPE_11B,
>> PHY_TYPE_11G,
>> PHY_TYPE_11A
>> } CARD_PHY_TYPE, *PCARD_PHY_TYPE;
>
> Why did you remove this?
Unlike the other two enums this patch change, this one is not in use.
As checkpatch complained about the typedef and it is not currently in
use, I removed it.

>



--
Peter

2014-07-15 23:49:07

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH V4 4/6] staging: vt6556: Remove typedefs

On Tue, Jul 15, 2014 at 10:05:54PM +0200, Peter Senna Tschudin wrote:
> On Tue, Jul 15, 2014 at 5:06 PM, Greg KH <[email protected]> wrote:
> > On Mon, Jul 14, 2014 at 09:15:31PM +0200, Peter Senna Tschudin wrote:
> >> This patch removes uneeded typedefs reported by chackpatch and removes
> >> one enum. The removed enum from card.h:
> >>
> >> typedef enum _CARD_PHY_TYPE {
> >> PHY_TYPE_AUTO = 0,
> >> PHY_TYPE_11B,
> >> PHY_TYPE_11G,
> >> PHY_TYPE_11A
> >> } CARD_PHY_TYPE, *PCARD_PHY_TYPE;
> >
> > Why did you remove this?
> Unlike the other two enums this patch change, this one is not in use.
> As checkpatch complained about the typedef and it is not currently in
> use, I removed it.

Then say that, we want to know _why_ you do something, not _what_ you
do, as it's obvious from the code as to _what_ happens.

thanks,

greg k-h