Commit 4d38a56b authored by Chris Park's avatar Chris Park Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: fix warnings for line over 80 characters 



This patch fixes warnings reported by checkpatch.pl
for line over 80 characters

Signed-off-by: default avatarChris Park <chris.park@atmel.com>
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1725aab

drivers/staging/wilc1000/wilc_wlan.c

+20 −13
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ static void wilc_wlan_txq_add_to_tail(struct net_device *dev, 
	up(&wilc->txq_event);

}



static int wilc_wlan_txq_add_to_head(struct wilc_vif *vif, struct txq_entry_t *tqe)

static int wilc_wlan_txq_add_to_head(struct wilc_vif *vif,

				     struct txq_entry_t *tqe)

{

	unsigned long flags;

	struct wilc *wilc = vif->wilc;
@@ -695,7 +696,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) 
		acquire_bus(wilc, ACQUIRE_AND_WAKEUP);

		counter = 0;

		do {

			ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_TX_CTRL,

			ret = wilc->hif_func->hif_read_reg(wilc,

							   WILC_HOST_TX_CTRL,

							   &reg);

			if (!ret) {

				wilc_debug(N_ERR, "[wilc txq]: fail can't read reg vmm_tbl_entry..\n");
@@ -728,7 +730,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) 
				break;

			}



			ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_VMM_CTL,

			ret = wilc->hif_func->hif_write_reg(wilc,

							    WILC_HOST_VMM_CTL,

							    0x2);

			if (!ret) {

				wilc_debug(N_ERR, "[wilc txq]: fail can't write reg host_vmm_ctl..\n");
@@ -1063,7 +1066,8 @@ void wilc_handle_isr(struct wilc *wilc) 
}

EXPORT_SYMBOL_GPL(wilc_handle_isr);



int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, u32 buffer_size)

int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer,

				u32 buffer_size)

{

	u32 offset;

	u32 addr, size, size2, blksz;
@@ -1096,8 +1100,8 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, u32 buffer_ 
				size2 = blksz;



			memcpy(dma_buffer, &buffer[offset], size2);

			ret = wilc->hif_func->hif_block_tx(wilc, addr, dma_buffer,

						       size2);

			ret = wilc->hif_func->hif_block_tx(wilc, addr,

							   dma_buffer, size2);

			if (!ret)

				break;
@@ -1233,7 +1237,8 @@ int wilc_wlan_stop(struct wilc *wilc) 
	}



	do {

		ret = wilc->hif_func->hif_read_reg(wilc, WILC_GLB_RESET_0, &reg);

		ret = wilc->hif_func->hif_read_reg(wilc,

						   WILC_GLB_RESET_0, &reg);

		if (!ret) {

			PRINT_ER("Error while reading reg\n");

			release_bus(wilc, RELEASE_ALLOW_SLEEP);
@@ -1246,13 +1251,15 @@ int wilc_wlan_stop(struct wilc *wilc) 
			PRINT_D(GENERIC_DBG, "Bit 10 not reset : Retry %d\n",

				timeout);

			reg &= ~BIT(10);

			ret = wilc->hif_func->hif_write_reg(wilc, WILC_GLB_RESET_0,

			ret = wilc->hif_func->hif_write_reg(wilc,

							    WILC_GLB_RESET_0,

							    reg);

			timeout--;

		} else {

			PRINT_D(GENERIC_DBG, "Bit 10 reset after : Retry %d\n",

				timeout);

			ret = wilc->hif_func->hif_read_reg(wilc, WILC_GLB_RESET_0,

			ret = wilc->hif_func->hif_read_reg(wilc,

							   WILC_GLB_RESET_0,

							   &reg);

			if (!ret) {

				PRINT_ER("Error while reading reg\n");

drivers/staging/wilc1000/wilc_wlan.h

+2 −1
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ struct wilc_cfg_rsp { 
struct wilc;

struct wilc_vif;



int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, u32 buffer_size);

int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer,

				u32 buffer_size);

int wilc_wlan_start(struct wilc *);

int wilc_wlan_stop(struct wilc *);

int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,