Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3fcb8a2 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: fix block comment warnings in hfa384x_usb.c 



 This patch fix the following checkpatch.pl warnings in hfa384x_usb.c:
 WARNING: Block comments should align the * on each line
 WARNING: Block comments use a trailing */ on a separate line

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a919c78

drivers/staging/wlan-ng/hfa384x_usb.c

+1213 −1157
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ void dbprint_urb(struct urb *urb) 
 *

 * Call context:

 *	Any

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int submit_rx_urb(struct hfa384x *hw, gfp_t memflags)

{

	struct sk_buff *skb;
@@ -387,7 +388,8 @@ static int submit_rx_urb(struct hfa384x *hw, gfp_t memflags) 
 *

 * Call context:

 *	Any

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int submit_tx_urb(struct hfa384x *hw, struct urb *tx_urb, gfp_t memflags)

{

	struct net_device *netdev = hw->wlandev->netdev;
@@ -430,7 +432,8 @@ static int submit_tx_urb(struct hfa384x *hw, struct urb *tx_urb, gfp_t memflags) 
 *

 * Call context:

 *	process (by design)

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usb_defer(struct work_struct *data)

{

	struct hfa384x *hw = container_of(data, struct hfa384x, usb_work);
@@ -524,7 +527,8 @@ static void hfa384x_usb_defer(struct work_struct *data) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

void hfa384x_create(struct hfa384x *hw, struct usb_device *usb)

{

	memset(hw, 0, sizeof(struct hfa384x));
@@ -595,7 +599,8 @@ void hfa384x_create(struct hfa384x *hw, struct usb_device *usb) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

void hfa384x_destroy(struct hfa384x *hw)

{

	struct sk_buff *skb;
@@ -652,7 +657,8 @@ usbctlx_get_rridresult(const struct hfa384x_usb_rridresp *rridresp, 
 * Completor object:

 * This completor must be passed to hfa384x_usbctlx_complete_sync()

 * when processing a CTLX that returns a struct hfa384x_cmdresult structure.

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

struct usbctlx_cmd_completor {

	struct usbctlx_completor head;
@@ -683,7 +689,8 @@ init_cmd_completor(struct usbctlx_cmd_completor *completor, 
 * Completor object:

 * This completor must be passed to hfa384x_usbctlx_complete_sync()

 * when processing a CTLX that reads a RID.

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

struct usbctlx_rrid_completor {

	struct usbctlx_completor head;
@@ -728,19 +735,22 @@ init_rrid_completor(struct usbctlx_rrid_completor *completor, 
/*----------------------------------------------------------------

 * Completor object:

 * Interprets the results of a synchronous RID-write

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

#define init_wrid_completor  init_cmd_completor



/*----------------------------------------------------------------

 * Completor object:

 * Interprets the results of a synchronous memory-write

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

#define init_wmem_completor  init_cmd_completor



/*----------------------------------------------------------------

 * Completor object:

 * Interprets the results of a synchronous memory-read

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

struct usbctlx_rmem_completor {

	struct usbctlx_completor head;
@@ -792,7 +802,8 @@ init_rmem_completor(struct usbctlx_rmem_completor *completor, 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_cb_status(struct hfa384x *hw,

			      const struct hfa384x_usbctlx *ctlx)

{
@@ -922,7 +933,8 @@ hfa384x_dowmem_async(struct hfa384x *hw, 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_cmd_initialize(struct hfa384x *hw)

{

	int result = 0;
@@ -968,7 +980,8 @@ int hfa384x_cmd_initialize(struct hfa384x *hw) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_cmd_disable(struct hfa384x *hw, u16 macport)

{

	struct hfa384x_metacmd cmd;
@@ -1001,7 +1014,8 @@ int hfa384x_cmd_disable(struct hfa384x *hw, u16 macport) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_cmd_enable(struct hfa384x *hw, u16 macport)

{

	struct hfa384x_metacmd cmd;
@@ -1043,7 +1057,8 @@ int hfa384x_cmd_enable(struct hfa384x *hw, u16 macport) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_cmd_monitor(struct hfa384x *hw, u16 enable)

{

	struct hfa384x_metacmd cmd;
@@ -1094,7 +1109,8 @@ int hfa384x_cmd_monitor(struct hfa384x *hw, u16 enable) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_cmd_download(struct hfa384x *hw, u16 mode, u16 lowaddr,

			 u16 highaddr, u16 codelen)

{
@@ -1135,7 +1151,8 @@ int hfa384x_cmd_download(struct hfa384x *hw, u16 mode, u16 lowaddr, 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_corereset(struct hfa384x *hw, int holdtime,

		      int settletime, int genesis)

{
@@ -1173,7 +1190,8 @@ int hfa384x_corereset(struct hfa384x *hw, int holdtime, 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int hfa384x_usbctlx_complete_sync(struct hfa384x *hw,

					 struct hfa384x_usbctlx *ctlx,

					 struct usbctlx_completor *completor)
@@ -1288,7 +1306,8 @@ static int hfa384x_usbctlx_complete_sync(struct hfa384x *hw, 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int

hfa384x_docmd(struct hfa384x *hw,

	      enum cmd_mode mode,
@@ -1376,7 +1395,8 @@ hfa384x_docmd(struct hfa384x *hw, 
 * Call context:

 *	interrupt (DOASYNC)

 *	process (DOWAIT or DOASYNC)

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int

hfa384x_dorrid(struct hfa384x *hw,

	       enum cmd_mode mode,
@@ -1457,7 +1477,8 @@ hfa384x_dorrid(struct hfa384x *hw, 
 * Call context:

 *	interrupt (DOASYNC)

 *	process (DOWAIT or DOASYNC)

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int

hfa384x_dowrid(struct hfa384x *hw,

	       enum cmd_mode mode,
@@ -1544,7 +1565,8 @@ hfa384x_dowrid(struct hfa384x *hw, 
 * Call context:

 *	interrupt (DOASYNC)

 *	process (DOWAIT or DOASYNC)

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int

hfa384x_dormem(struct hfa384x *hw,

	       enum cmd_mode mode,
@@ -1635,7 +1657,8 @@ hfa384x_dormem(struct hfa384x *hw, 
 * Call context:

 *	interrupt (DOWAIT)

 *	process (DOWAIT or DOASYNC)

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int

hfa384x_dowmem(struct hfa384x *hw,

	       enum cmd_mode mode,
@@ -1715,7 +1738,8 @@ hfa384x_dowmem(struct hfa384x *hw, 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport)

{

	int result = 0;
@@ -1753,7 +1777,8 @@ int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport)

{

	int result = 0;
@@ -1790,7 +1815,8 @@ int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_flashdl_enable(struct hfa384x *hw)

{

	int result = 0;
@@ -1849,7 +1875,8 @@ int hfa384x_drvr_flashdl_enable(struct hfa384x *hw) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_flashdl_disable(struct hfa384x *hw)

{

	/* Check that we're already in the download state */
@@ -1894,7 +1921,8 @@ int hfa384x_drvr_flashdl_disable(struct hfa384x *hw) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr,

			       void *buf, u32 len)

{
@@ -2033,7 +2061,8 @@ int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len)

{

	return hfa384x_dorrid_wait(hw, rid, buf, len);
@@ -2061,7 +2090,8 @@ int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len) 
 *

 * Call context:

 *       process

 ----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int

hfa384x_drvr_setconfig_async(struct hfa384x *hw,

			     u16 rid,
@@ -2089,7 +2119,8 @@ hfa384x_drvr_setconfig_async(struct hfa384x *hw, 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_ramdl_disable(struct hfa384x *hw)

{

	/* Check that we're already in the download state */
@@ -2129,7 +2160,8 @@ int hfa384x_drvr_ramdl_disable(struct hfa384x *hw) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr)

{

	int result = 0;
@@ -2198,7 +2230,8 @@ int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len)

{

	int result = 0;
@@ -2272,13 +2305,14 @@ int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len) 
 *	-ENODATA	the buffer does NOT contain a valid PDA.

 *			Either the card PDA is bad, or the auxdata

 *			reads are giving us garbage.



 *

 *

 * Side effects:

 *

 * Call context:

 *	process or non-card interrupt.

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len)

{

	int result = 0;
@@ -2388,7 +2422,8 @@ int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len)

{

	return hfa384x_dowrid_wait(hw, rid, buf, len);
@@ -2412,8 +2447,8 @@ int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/



 *----------------------------------------------------------------

 */

int hfa384x_drvr_start(struct hfa384x *hw)

{

	int result, result1, result2;
@@ -2514,7 +2549,8 @@ int hfa384x_drvr_start(struct hfa384x *hw) 
 *

 * Call context:

 *	process

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_stop(struct hfa384x *hw)

{

	int i;
@@ -2564,7 +2600,8 @@ int hfa384x_drvr_stop(struct hfa384x *hw) 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,

			 union p80211_hdr *p80211_hdr,

			 struct p80211_metawep *p80211_wep)
@@ -2690,7 +2727,8 @@ void hfa384x_tx_timeout(struct wlandevice *wlandev) 
 *

 * Call context:

 *	Interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbctlx_reaper_task(unsigned long data)

{

	struct hfa384x *hw = (struct hfa384x *)data;
@@ -2723,7 +2761,8 @@ static void hfa384x_usbctlx_reaper_task(unsigned long data) 
 *

 * Call context:

 *	Interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbctlx_completion_task(unsigned long data)

{

	struct hfa384x *hw = (struct hfa384x *)data;
@@ -2799,7 +2838,8 @@ static void hfa384x_usbctlx_completion_task(unsigned long data) 
 *

 * Call context:

 *	Either process or interrupt, but presumably interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int unlocked_usbctlx_cancel_async(struct hfa384x *hw,

					 struct hfa384x_usbctlx *ctlx)

{
@@ -2849,7 +2889,8 @@ static int unlocked_usbctlx_cancel_async(struct hfa384x *hw, 
 *

 * Call context:

 *	Either, assume interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void unlocked_usbctlx_complete(struct hfa384x *hw,

				      struct hfa384x_usbctlx *ctlx)

{
@@ -2889,7 +2930,8 @@ static void unlocked_usbctlx_complete(struct hfa384x *hw, 
 *

 * Call context:

 *	any

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbctlxq_run(struct hfa384x *hw)

{

	unsigned long flags;
@@ -2989,7 +3031,8 @@ static void hfa384x_usbctlxq_run(struct hfa384x *hw) 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbin_callback(struct urb *urb)

{

	struct wlandevice *wlandev = urb->context;
@@ -3169,7 +3212,8 @@ static void hfa384x_usbin_callback(struct urb *urb) 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbin_ctlx(struct hfa384x *hw, union hfa384x_usbin *usbin,

			       int urb_status)

{
@@ -3288,7 +3332,8 @@ static void hfa384x_usbin_ctlx(struct hfa384x *hw, union hfa384x_usbin *usbin, 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbin_txcompl(struct wlandevice *wlandev,

				  union hfa384x_usbin *usbin)

{
@@ -3319,7 +3364,8 @@ static void hfa384x_usbin_txcompl(struct wlandevice *wlandev, 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)

{

	union hfa384x_usbin *usbin = (union hfa384x_usbin *)skb->data;
@@ -3419,7 +3465,8 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb) 
 *	Allocates an skb and passes it up via the PF_PACKET interface.

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,

				  struct hfa384x_usb_rxfrm *rxfrm)

{
@@ -3478,7 +3525,8 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev, 
	}



	/* Copy the 802.11 header to the skb

	   (ctl frames may be less than a full header) */

	 * (ctl frames may be less than a full header)

	 */

	datap = skb_put(skb, hdrlen);

	memcpy(datap, &(rxdesc->frame_control), hdrlen);
@@ -3520,7 +3568,8 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev, 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbin_info(struct wlandevice *wlandev,

			       union hfa384x_usbin *usbin)

{
@@ -3544,7 +3593,8 @@ static void hfa384x_usbin_info(struct wlandevice *wlandev, 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbout_callback(struct urb *urb)

{

	struct wlandevice *wlandev = urb->context;
@@ -3619,7 +3669,8 @@ static void hfa384x_usbout_callback(struct urb *urb) 
 *

 * Call context:

 * interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_ctlxout_callback(struct urb *urb)

{

	struct hfa384x *hw = urb->context;
@@ -3750,7 +3801,8 @@ static void hfa384x_ctlxout_callback(struct urb *urb) 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbctlx_reqtimerfn(unsigned long data)

{

	struct hfa384x *hw = (struct hfa384x *)data;
@@ -3808,7 +3860,8 @@ static void hfa384x_usbctlx_reqtimerfn(unsigned long data) 
 *

 * Call context:

 *	interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usbctlx_resptimerfn(unsigned long data)

{

	struct hfa384x *hw = (struct hfa384x *)data;
@@ -3847,7 +3900,8 @@ static void hfa384x_usbctlx_resptimerfn(unsigned long data) 
 *

 * Call context:

 *	Interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static void hfa384x_usb_throttlefn(unsigned long data)

{

	struct hfa384x *hw = (struct hfa384x *)data;
@@ -3889,7 +3943,8 @@ static void hfa384x_usb_throttlefn(unsigned long data) 
 *

 * Call context:

 *	process or interrupt

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int hfa384x_usbctlx_submit(struct hfa384x *hw,

				  struct hfa384x_usbctlx *ctlx)

{
@@ -3925,7 +3980,8 @@ static int hfa384x_usbctlx_submit(struct hfa384x *hw, 
 * Side effects:

 *

 * Call context:

----------------------------------------------------------------*/

 *----------------------------------------------------------------

 */

static int hfa384x_isgood_pdrcode(u16 pdrcode)

{

	switch (pdrcode) {