Commit 0edeea29 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: fixes blank lines aren't necessary brace

This patch fixes the checks reported by checkpatch.pl
for Blank lines aren't necessary after an open brace '{' and
Blank lines aren't necessary before a close brace '}'.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85489fe1
...@@ -59,7 +59,6 @@ static CHIP_PS_STATE_T genuChipPSstate = CHIP_WAKEDUP; ...@@ -59,7 +59,6 @@ static CHIP_PS_STATE_T genuChipPSstate = CHIP_WAKEDUP;
static inline void acquire_bus(BUS_ACQUIRE_T acquire) static inline void acquire_bus(BUS_ACQUIRE_T acquire)
{ {
mutex_lock(&g_linux_wlan->hif_cs); mutex_lock(&g_linux_wlan->hif_cs);
#ifndef WILC_OPTIMIZE_SLEEP_INT #ifndef WILC_OPTIMIZE_SLEEP_INT
if (genuChipPSstate != CHIP_WAKEDUP) if (genuChipPSstate != CHIP_WAKEDUP)
...@@ -68,7 +67,6 @@ static inline void acquire_bus(BUS_ACQUIRE_T acquire) ...@@ -68,7 +67,6 @@ static inline void acquire_bus(BUS_ACQUIRE_T acquire)
if (acquire == ACQUIRE_AND_WAKEUP) if (acquire == ACQUIRE_AND_WAKEUP)
chip_wakeup(); chip_wakeup();
} }
} }
static inline void release_bus(BUS_RELEASE_T release) static inline void release_bus(BUS_RELEASE_T release)
{ {
...@@ -81,10 +79,8 @@ static inline void release_bus(BUS_RELEASE_T release) ...@@ -81,10 +79,8 @@ static inline void release_bus(BUS_RELEASE_T release)
static void wilc_wlan_txq_remove(struct txq_entry_t *tqe) static void wilc_wlan_txq_remove(struct txq_entry_t *tqe)
{ {
wilc_wlan_dev_t *p = &g_wlan; wilc_wlan_dev_t *p = &g_wlan;
if (tqe == p->txq_head) { if (tqe == p->txq_head) {
p->txq_head = tqe->next; p->txq_head = tqe->next;
if (p->txq_head) if (p->txq_head)
p->txq_head->prev = NULL; p->txq_head->prev = NULL;
...@@ -97,7 +93,6 @@ static void wilc_wlan_txq_remove(struct txq_entry_t *tqe) ...@@ -97,7 +93,6 @@ static void wilc_wlan_txq_remove(struct txq_entry_t *tqe)
tqe->next->prev = tqe->prev; tqe->next->prev = tqe->prev;
} }
p->txq_entries -= 1; p->txq_entries -= 1;
} }
static struct txq_entry_t * static struct txq_entry_t *
...@@ -191,7 +186,6 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe) ...@@ -191,7 +186,6 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
PRINT_D(TX_DBG, "Wake up the txq_handler\n"); PRINT_D(TX_DBG, "Wake up the txq_handler\n");
return 0; return 0;
} }
u32 Statisitcs_totalAcks = 0, Statisitcs_DroppedAcks = 0; u32 Statisitcs_totalAcks = 0, Statisitcs_DroppedAcks = 0;
...@@ -228,9 +222,7 @@ u32 Pending_Acks; ...@@ -228,9 +222,7 @@ u32 Pending_Acks;
static inline int Init_TCP_tracking(void) static inline int Init_TCP_tracking(void)
{ {
return 0; return 0;
} }
static inline int add_TCP_track_session(u32 src_prt, u32 dst_prt, u32 seq) static inline int add_TCP_track_session(u32 src_prt, u32 dst_prt, u32 seq)
{ {
...@@ -246,11 +238,9 @@ static inline int add_TCP_track_session(u32 src_prt, u32 dst_prt, u32 seq) ...@@ -246,11 +238,9 @@ static inline int add_TCP_track_session(u32 src_prt, u32 dst_prt, u32 seq)
static inline int Update_TCP_track_session(u32 index, u32 Ack) static inline int Update_TCP_track_session(u32 index, u32 Ack)
{ {
if (Ack > Acks_keep_track_info[index].Bigger_Ack_num) if (Ack > Acks_keep_track_info[index].Bigger_Ack_num)
Acks_keep_track_info[index].Bigger_Ack_num = Ack; Acks_keep_track_info[index].Bigger_Ack_num = Ack;
return 0; return 0;
} }
static inline int add_TCP_Pending_Ack(u32 Ack, u32 Session_index, struct txq_entry_t *txqe) static inline int add_TCP_Pending_Ack(u32 Ack, u32 Session_index, struct txq_entry_t *txqe)
{ {
...@@ -261,7 +251,6 @@ static inline int add_TCP_Pending_Ack(u32 Ack, u32 Session_index, struct txq_ent ...@@ -261,7 +251,6 @@ static inline int add_TCP_Pending_Ack(u32 Ack, u32 Session_index, struct txq_ent
Pending_Acks_info[PendingAcks_arrBase + Pending_Acks].Session_index = Session_index; Pending_Acks_info[PendingAcks_arrBase + Pending_Acks].Session_index = Session_index;
txqe->tcp_PendingAck_index = PendingAcks_arrBase + Pending_Acks; txqe->tcp_PendingAck_index = PendingAcks_arrBase + Pending_Acks;
Pending_Acks++; Pending_Acks++;
} else { } else {
} }
...@@ -466,7 +455,6 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer, ...@@ -466,7 +455,6 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,
int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer, int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,
u32 buffer_size, wilc_tx_complete_func_t func) u32 buffer_size, wilc_tx_complete_func_t func)
{ {
wilc_wlan_dev_t *p = &g_wlan; wilc_wlan_dev_t *p = &g_wlan;
struct txq_entry_t *tqe; struct txq_entry_t *tqe;
...@@ -605,7 +593,6 @@ static inline void chip_wakeup(void) ...@@ -605,7 +593,6 @@ static inline void chip_wakeup(void)
if ((clk_status_reg & 0x1) == 0) if ((clk_status_reg & 0x1) == 0)
wilc_debug(N_ERR, "clocks still OFF. Wake up failed\n"); wilc_debug(N_ERR, "clocks still OFF. Wake up failed\n");
} }
if ((clk_status_reg & 0x1) == 0) { if ((clk_status_reg & 0x1) == 0) {
g_wlan.hif_func.hif_write_reg(0xf0, reg & g_wlan.hif_func.hif_write_reg(0xf0, reg &
...@@ -694,7 +681,6 @@ void chip_sleep_manually(u32 u32SleepTime) ...@@ -694,7 +681,6 @@ void chip_sleep_manually(u32 u32SleepTime)
genuChipPSstate = CHIP_SLEEPING_MANUAL; genuChipPSstate = CHIP_SLEEPING_MANUAL;
release_bus(RELEASE_ONLY); release_bus(RELEASE_ONLY);
} }
int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount) int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount)
...@@ -733,7 +719,6 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount) ...@@ -733,7 +719,6 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount)
sum = 0; sum = 0;
do { do {
if ((tqe != NULL) && (i < (WILC_VMM_TBL_SIZE - 1))) { if ((tqe != NULL) && (i < (WILC_VMM_TBL_SIZE - 1))) {
if (tqe->type == WILC_CFG_PKT) if (tqe->type == WILC_CFG_PKT)
vmm_sz = ETH_CONFIG_PKT_HDR_OFFSET; vmm_sz = ETH_CONFIG_PKT_HDR_OFFSET;
...@@ -782,7 +767,6 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount) ...@@ -782,7 +767,6 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount)
acquire_bus(ACQUIRE_AND_WAKEUP); acquire_bus(ACQUIRE_AND_WAKEUP);
counter = 0; counter = 0;
do { do {
ret = p->hif_func.hif_read_reg(WILC_HOST_TX_CTRL, &reg); ret = p->hif_func.hif_read_reg(WILC_HOST_TX_CTRL, &reg);
if (!ret) { if (!ret) {
wilc_debug(N_ERR, "[wilc txq]: fail can't read reg vmm_tbl_entry..\n"); wilc_debug(N_ERR, "[wilc txq]: fail can't read reg vmm_tbl_entry..\n");
...@@ -1015,7 +999,6 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc) ...@@ -1015,7 +999,6 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
} }
else else
{ {
if (!is_cfg_packet) { if (!is_cfg_packet) {
if (pkt_len > 0) { if (pkt_len > 0) {
frmw_to_linux(wilc, frmw_to_linux(wilc,
...@@ -1064,7 +1047,6 @@ static void wilc_unknown_isr_ext(void) ...@@ -1064,7 +1047,6 @@ static void wilc_unknown_isr_ext(void)
} }
static void wilc_pllupdate_isr_ext(u32 int_stats) static void wilc_pllupdate_isr_ext(u32 int_stats)
{ {
int trials = 10; int trials = 10;
g_wlan.hif_func.hif_clear_int_ext(PLL_INT_CLR); g_wlan.hif_func.hif_clear_int_ext(PLL_INT_CLR);
...@@ -1106,7 +1088,6 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status) ...@@ -1106,7 +1088,6 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status)
p->hif_func.hif_read_size(&size); p->hif_func.hif_read_size(&size);
size = ((size & 0x7fff) << 2); size = ((size & 0x7fff) << 2);
retries++; retries++;
} }
if (size > 0) { if (size > 0) {
...@@ -1457,7 +1438,6 @@ void wilc_wlan_cleanup(struct net_device *dev) ...@@ -1457,7 +1438,6 @@ void wilc_wlan_cleanup(struct net_device *dev)
} }
release_bus(RELEASE_ALLOW_SLEEP); release_bus(RELEASE_ALLOW_SLEEP);
p->hif_func.hif_deinit(NULL); p->hif_func.hif_deinit(NULL);
} }
static int wilc_wlan_cfg_commit(int type, u32 drvHandler) static int wilc_wlan_cfg_commit(int type, u32 drvHandler)
...@@ -1523,7 +1503,6 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size, ...@@ -1523,7 +1503,6 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
p->cfg_frame_in_use = 0; p->cfg_frame_in_use = 0;
p->cfg_frame_offset = 0; p->cfg_frame_offset = 0;
p->cfg_seq_no += 1; p->cfg_seq_no += 1;
} }
return ret_size; return ret_size;
...@@ -1614,7 +1593,6 @@ u32 init_chip(struct net_device *dev) ...@@ -1614,7 +1593,6 @@ u32 init_chip(struct net_device *dev)
release_bus(RELEASE_ONLY); release_bus(RELEASE_ONLY);
return ret; return ret;
} }
u32 wilc_get_chipid(u8 update) u32 wilc_get_chipid(u8 update)
...@@ -1653,7 +1631,6 @@ u32 wilc_get_chipid(u8 update) ...@@ -1653,7 +1631,6 @@ u32 wilc_get_chipid(u8 update)
int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp) int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
{ {
int ret = 0; int ret = 0;
PRINT_D(INIT_DBG, "Initializing WILC_Wlan ...\n"); PRINT_D(INIT_DBG, "Initializing WILC_Wlan ...\n");
...@@ -1726,7 +1703,6 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp) ...@@ -1726,7 +1703,6 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
g_wlan.tx_buffer = NULL; g_wlan.tx_buffer = NULL;
return ret; return ret;
} }
u16 set_machw_change_vir_if(struct net_device *dev, bool bValue) u16 set_machw_change_vir_if(struct net_device *dev, bool bValue)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment