From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751369AbdCSAJN (ORCPT ); Sat, 18 Mar 2017 20:09:13 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36806 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751133AbdCSAJI (ORCPT ); Sat, 18 Mar 2017 20:09:08 -0400 From: Derek Robson To: gregkh@linuxfoundation.org, wsa@the-dreams.de, karniksayli1995@gmail.com, nrosbrook@mail.smcvt.edu, elfring@users.sourceforge.net, mattkilgore12@gmail.com, shiva@exdev.nl, bhumirks@gmail.com, robsonde@gmail.com, sabitha.george@gmail.com, punitvara@gmail.com, weiyongjun1@huawei.com, georgiana.chelu93@gmail.com, goudapatilk@gmail.com, mihaela.muraru21@gmail.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] Staging: ks7010 - fixed style block comments Date: Sun, 19 Mar 2017 13:07:17 +1300 Message-Id: <20170319000717.25947-1-robsonde@gmail.com> X-Mailer: git-send-email 2.12.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixed style of all block comments across whole driver Found by checkpatch Signed-off-by: Derek Robson --- drivers/staging/ks7010/ks7010_sdio.c | 3 ++- drivers/staging/ks7010/ks_hostif.h | 35 +++++++++++++++++++++--------- drivers/staging/ks7010/ks_wlan.h | 3 ++- drivers/staging/ks7010/ks_wlan_net.c | 41 +++++++++++++++++++++++------------- 4 files changed, 55 insertions(+), 27 deletions(-) diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index 6f9f746a3a61..1311e83b99d8 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -496,7 +496,8 @@ static void ks7010_rw_function(struct work_struct *work) while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) { DPRINTK(4, "wait after WAKEUP\n"); /* queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,&priv->ks_wlan_hw.rw_wq, - (priv->last_wakeup + ((30*HZ)/1000) - jiffies));*/ + * (priv->last_wakeup + ((30*HZ)/1000) - jiffies)); + */ dev_info(&priv->ks_wlan_hw.sdio_card->func->dev, "wake: %lu %lu\n", priv->last_wakeup + (30 * HZ) / 1000, diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h index 30c49b699d62..c7636e829c40 100644 --- a/drivers/staging/ks7010/ks_hostif.h +++ b/drivers/staging/ks7010/ks_hostif.h @@ -360,8 +360,11 @@ struct hostif_ps_adhoc_set_request_t { #define CTS_MODE_TRUE 1 uint16_t channel; struct rate_set16_t rate_set; - uint16_t capability; /* bit5:preamble bit6:pbcc pbcc not supported always 0 - * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM not supported always 0 */ + uint16_t capability; /* bit5:preamble + * bit6:pbcc pbcc not supported always 0 + * bit10:ShortSlotTime + * bit13:DSSS-OFDM DSSS-OFDM not supported always 0 + */ uint16_t scan_type; } __packed; @@ -376,8 +379,11 @@ struct hostif_infrastructure_set_request_t { uint16_t cts_mode; struct rate_set16_t rate_set; struct ssid_t ssid; - uint16_t capability; /* bit5:preamble bit6:pbcc pbcc not supported always 0 - * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM not supported always 0 */ + uint16_t capability; /* bit5:preamble + * bit6:pbcc pbcc not supported always 0 + * bit10:ShortSlotTime + * bit13:DSSS-OFDM DSSS-OFDM not supported always 0 + */ uint16_t beacon_lost_count; uint16_t auth_type; #define AUTH_TYPE_OPEN_SYSTEM 0 @@ -392,8 +398,11 @@ struct hostif_infrastructure_set2_request_t { uint16_t cts_mode; struct rate_set16_t rate_set; struct ssid_t ssid; - uint16_t capability; /* bit5:preamble bit6:pbcc pbcc not supported always 0 - * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM not supported always 0 */ + uint16_t capability; /* bit5:preamble + * bit6:pbcc pbcc not supported always 0 + * bit10:ShortSlotTime + * bit13:DSSS-OFDM DSSS-OFDM not supported always 0 + */ uint16_t beacon_lost_count; uint16_t auth_type; #define AUTH_TYPE_OPEN_SYSTEM 0 @@ -415,8 +424,11 @@ struct hostif_adhoc_set_request_t { uint16_t channel; struct rate_set16_t rate_set; struct ssid_t ssid; - uint16_t capability; /* bit5:preamble bit6:pbcc pbcc not supported always 0 - * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM not supported always 0 */ + uint16_t capability; /* bit5:preamble + * bit6:pbcc pbcc not supported always 0 + * bit10:ShortSlotTime + * bit13:DSSS-OFDM DSSS-OFDM not supported always 0 + */ uint16_t scan_type; } __packed; @@ -427,8 +439,11 @@ struct hostif_adhoc_set2_request_t { uint16_t reserved; struct rate_set16_t rate_set; struct ssid_t ssid; - uint16_t capability; /* bit5:preamble bit6:pbcc pbcc not supported always 0 - * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM not supported always 0 */ + uint16_t capability; /* bit5:preamble + * bit6:pbcc pbcc not supported always 0 + * bit10:ShortSlotTime + * bit13:DSSS-OFDM DSSS-OFDM not supported always 0 + */ uint16_t scan_type; struct channel_list_t channel_list; uint8_t bssid[ETH_ALEN]; diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index 9ab80e1f123e..540319d49c7a 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h @@ -356,7 +356,8 @@ struct wpa_key_t { u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast * (group) keys or unicast address for - * individual keys */ + * individual keys + */ u16 alg; u16 key_len; /* WEP: 5 or 13, TKIP: 32, CCMP: 16 */ u8 key_val[IW_ENCODING_TOKEN_MAX]; diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 121e1530fdba..902b7a5abb22 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -230,7 +230,8 @@ static int ks_wlan_set_freq(struct net_device *dev, else { int channel = fwrq->m; /* We should do a better check than that, - * based on the card capability !!! */ + * based on the card capability !!! + */ if ((channel < 1) || (channel > 14)) { netdev_dbg(dev, "%s: New channel value of %d is invalid!\n", @@ -343,7 +344,8 @@ static int ks_wlan_get_essid(struct net_device *dev, /* for SLEEP MODE */ /* Note : if dwrq->flags != 0, we should - * get the relevant SSID from the SSID list... */ + * get the relevant SSID from the SSID list... + */ if (priv->reg.ssid.size) { /* Get the current SSID */ memcpy(extra, priv->reg.ssid.body, priv->reg.ssid.size); @@ -1137,7 +1139,8 @@ static int ks_wlan_get_range(struct net_device *dev, range->max_nwid = 0x0000; range->num_channels = 14; /* Should be based on cap_rid.country to give only - * what the current card support */ + * what the current card support + */ k = 0; for (i = 0; i < 13; i++) { /* channel 1 -- 13 */ range->freq[k].i = i + 1; /* List index */ @@ -1189,7 +1192,8 @@ static int ks_wlan_get_range(struct net_device *dev, /* Set an indication of the max TCP throughput * in bit/s that we can expect using this interface. - * May be use for QoS stuff... Jean II */ + * May be use for QoS stuff... Jean II + */ if (i > 2) range->throughput = 5000 * 1000; else @@ -1225,7 +1229,8 @@ static int ks_wlan_get_range(struct net_device *dev, /* Experimental measurements - boundary 11/5.5 Mb/s */ /* Note : with or without the (local->rssi), results - * are somewhat different. - Jean II */ + * are somewhat different. - Jean II + */ range->avg_qual.qual = 50; range->avg_qual.level = 186; /* -70 dBm */ range->avg_qual.noise = 0; @@ -1497,7 +1502,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev, &(ap->ssid.body[0])); /* Rate : stuffing multiple values in a single event require a bit - * more of magic - Jean II */ + * more of magic - Jean II + */ current_val = current_ev + IW_EV_LCP_LEN; iwe.cmd = SIOCGIWRATE; @@ -1569,7 +1575,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev, } /* The other data in the scan result are not really - * interesting, so for now drop it - Jean II */ + * interesting, so for now drop it - Jean II + */ return current_ev; } @@ -1596,7 +1603,8 @@ static int ks_wlan_get_scan(struct net_device *dev, if (priv->aplist.size == 0) { /* Client error, no scan results... - * The caller need to restart the scan. */ + * The caller need to restart the scan. + */ DPRINTK(2, "aplist 0\n"); return -ENODATA; } @@ -1971,11 +1979,12 @@ static int ks_wlan_get_encode_ext(struct net_device *dev, /* for SLEEP MODE */ /* WPA (not used ?? wpa_supplicant) - struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv; - struct iw_encode_ext *enc; - enc = (struct iw_encode_ext *)extra; - int index = dwrq->flags & IW_ENCODE_INDEX; - WPA (not used ?? wpa_supplicant) */ + * struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv; + * struct iw_encode_ext *enc; + * enc = (struct iw_encode_ext *)extra; + * int index = dwrq->flags & IW_ENCODE_INDEX; + * WPA (not used ?? wpa_supplicant) + */ return 0; } @@ -2105,7 +2114,8 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev) } /* Packets discarded in the wireless adapter due to wireless - * specific problems */ + * specific problems + */ wstats->discard.nwid = 0; /* Rx invalid nwid */ wstats->discard.code = 0; /* Rx invalid crypt */ wstats->discard.fragment = 0; /* Rx invalid frag */ @@ -3351,7 +3361,8 @@ void send_packet_complete(void *arg1, void *arg2) } /* Set or clear the multicast filter for this adaptor. - This routine is not state sensitive and need not be SMP locked. */ + * This routine is not state sensitive and need not be SMP locked. + */ static void ks_wlan_set_multicast_list(struct net_device *dev) { -- 2.12.0