staging-next: wlan-ng: resolve checkpatch issues
PATCH 1/1 staging-next: wlan-ng: resolve checkpatch issues
fixing following checkpatch warning wherever possible:
WARNING: line over 80 characters
--- drivers/staging/wlan-ng/cfg80211.c | 11 ++++++++--- drivers/staging/wlan-ng/hfa384x.h | 21 ++++++++++++++------- drivers/staging/wlan-ng/p80211netdev.c | 3 ++- 3 files changed, 24 insertions(+), 11 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +0 -0
@@ -163,7 +163,8 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev,
goto exit; /* send key to driver */
- did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index + 1);
+ did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index
+ + 1);
result = prism2_domibset_pstr32(wlandev, did, params->key_len, params->key); @@ -386,7 +387,10 @@ static int prism2_scan(struct wiphy *wiphy, msg2.beaconperiod.data, ie_buf, ie_len, - (msg2.signal.data - 65536) * 100, /* Conversion to signed type */ + (msg2.signal.data - 65536) * 100, /* + * Conversion to + * signed type + */ GFP_KERNEL );
@@ -692,7 +696,8 @@ static const struct cfg80211_ops prism2_usb_cfg_ops = {
};
/* Functions to create/free wiphy interface */
-static struct wiphy *wlan_create_wiphy(struct device *dev, struct wlandevice *wlandev) +static struct wiphy *wlan_create_wiphy(struct device *dev,
+ struct wlandevice *wlandev)
{
struct wiphy *wiphy;
struct prism2_wiphy_private *priv;drivers/staging/wlan-ng/hfa384x.h +0 -0
@@ -516,7 +516,8 @@ struct hfa384x_tx_frame {
HFA384x_TXSTATUS_DISCON | HFA384x_TXSTATUS_AGEDERR | \ HFA384x_TXSTATUS_RETRYERR))
-#define HFA384x_TX_SET(v, m, s) ((((u16)(v)) << ((u16)(s))) & ((u16)(m)))
+#define HFA384x_TX_SET(v, m, s) ((((u16)(v)) << ((u16)(s))) \
+ & ((u16)(m)))
#define HFA384x_TX_MACPORT_SET(v) HFA384x_TX_SET(v, HFA384x_TX_MACPORT, 8)
#define HFA384x_TX_STRUCTYPE_SET(v) HFA384x_TX_SET(v, \
@@ -1336,7 +1337,9 @@ struct hfa384x {
* interface
*/- struct hfa384x_caplevel cap_act_sta_mfi; /* sta f/w to modem interface */
+ struct hfa384x_caplevel cap_act_sta_mfi; /*
+ * sta f/w to modem interface
+ */
struct hfa384x_caplevel cap_act_ap_cfi; /* * ap f/w to controller
@@ -1358,7 +1361,9 @@ struct hfa384x {
struct hfa384x_inf_frame *scanresults;
- struct prism2sta_authlist authlist; /* Authenticated station list. */
+ struct prism2sta_authlist authlist; /*
+ * Authenticated station list.
+ */
unsigned int accessmode; /* Access mode. */
struct prism2sta_accesslist allow; /* Allowed station list. */
struct prism2sta_accesslist deny; /* Denied station list. */
@@ -1368,13 +1373,14 @@ struct hfa384x {
void hfa384x_create(struct hfa384x *hw, struct usb_device *usb); void hfa384x_destroy(struct hfa384x *hw);
-int
-hfa384x_corereset(struct hfa384x *hw, int holdtime, int settletime, int genesis); +int hfa384x_corereset(struct hfa384x *hw, int holdtime,
+ int settletime, int genesis);
int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_flashdl_enable(struct hfa384x *hw);
int hfa384x_drvr_flashdl_disable(struct hfa384x *hw);
-int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len); +int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr,
+ void *buf, u32 len);
int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr);
int hfa384x_drvr_ramdl_disable(struct hfa384x *hw);
@@ -1382,7 +1388,8 @@ int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len);
int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len);
int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
-static inline int hfa384x_drvr_getconfig16(struct hfa384x *hw, u16 rid, void *val) +static inline int hfa384x_drvr_getconfig16(struct hfa384x *hw,
+ u16 rid, void *val)
{
int result = 0;drivers/staging/wlan-ng/p80211netdev.c +0 -0
@@ -640,7 +640,8 @@ static int p80211knetdev_set_mac_address(struct net_device *dev, void *addr)
dot11req.msgcode = DIDmsg_dot11req_mibset; dot11req.msglen = sizeof(dot11req); memcpy(dot11req.devname, - ((struct wlandevice *)dev->ml_priv)->name, WLAN_DEVNAMELEN_MAX - 1); + ((struct wlandevice *)dev->ml_priv)->name, + WLAN_DEVNAMELEN_MAX - 1);
/* Set up the mibattribute argument */ mibattr->did = DIDmsg_dot11req_mibset_mibattribute;
--
2.11.0
Greg KH
maintainerQuoted 15 lines · Ranjit W
fixing following checkpatch warning wherever possible:
WARNING: line over 80 charactersSigned-off-by Ranjit W <[email protected]>--- drivers/staging/wlan-ng/cfg80211.c | 11 ++++++++--- drivers/staging/wlan-ng/hfa384x.h | 21 ++++++++++++++------- drivers/staging/wlan-ng/p80211netdev.c | 3 ++- 3 files changed, 24 insertions(+), 11 deletions(-)drivers/staging/wlan-ng/cfg80211.c +0
-0
drivers/staging/wlan-ng/cfg80211.c static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, · line 167
Quoted 6 lines
drivers/staging/wlan-ng/cfg80211.c +2
-1@@ -163,7 +163,8 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, goto exit;/* send key to driver */ - did =DIDmib_dot11smt_dot11WEPDefaultKeysTable_key (key_index +1 ); + did =DIDmib_dot11smt_dot11WEPDefaultKeysTable_key (key_index + +1 );
Ick, that looks horrible now, don't you think? checkpatch is a guide, not a rule-that-must-always-be-followed.
There are other ways to fix this up, look at that horrible function name for one such way to resolve it.
thanks,
greg k-h