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

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

staging: wlang-ng: avoid new typedef: hfa384x_cmdresult_t 



This patch fixes the following checkpatch.pl warning in hfa384x.h:
WARNING: do not add new typedefs

It applies for typedef hfa384x_cmdresult_t

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

drivers/staging/wlan-ng/hfa384x.h

+3 −3
Original line number Diff line number Diff line
@@ -1138,12 +1138,12 @@ struct hfa384x_pdrec { 
 * ---  Also, a collection of support types --

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

 */

typedef struct hfa384x_statusresult {

struct hfa384x_cmdresult {

	u16 status;

	u16 resp0;

	u16 resp1;

	u16 resp2;

} hfa384x_cmdresult_t;

};



/* USB Control Exchange (CTLX):

 *  A queue of the structure below is maintained for all of the
@@ -1213,7 +1213,7 @@ typedef struct hfa484x_metacmd { 
	u16 parm1;

	u16 parm2;



	hfa384x_cmdresult_t result;

	struct hfa384x_cmdresult result;

} hfa384x_metacmd_t;



#define	MAX_GRP_ADDR		32

drivers/staging/wlan-ng/hfa384x_usb.c

+8 −8
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void hfa384x_cb_status(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx); 


static int

usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp,

		   hfa384x_cmdresult_t *result);

		   struct hfa384x_cmdresult *result);



static void

usbctlx_get_rridresult(const struct hfa384x_usb_rridresp *rridresp,
@@ -622,7 +622,7 @@ static hfa384x_usbctlx_t *usbctlx_alloc(void) 


static int

usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp,

		   hfa384x_cmdresult_t *result)

		   struct hfa384x_cmdresult *result)

{

	result->status = le16_to_cpu(cmdresp->status);

	result->resp0 = le16_to_cpu(cmdresp->resp0);
@@ -647,13 +647,13 @@ 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 hfa384x_cmdresult_t structure.

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

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

struct usbctlx_cmd_completor {

	struct usbctlx_completor head;



	const struct hfa384x_usb_statusresp *cmdresp;

	hfa384x_cmdresult_t *result;

	struct hfa384x_cmdresult *result;

};



static inline int usbctlx_cmd_completor_fn(struct usbctlx_completor *head)
@@ -669,7 +669,7 @@ static inline struct usbctlx_completor *init_cmd_completor( 
							*completor,

						const struct hfa384x_usb_statusresp

							*cmdresp,

						hfa384x_cmdresult_t *result)

						struct hfa384x_cmdresult *result)

{

	completor->head.complete = usbctlx_cmd_completor_fn;

	completor->cmdresp = cmdresp;
@@ -798,7 +798,7 @@ static inline struct usbctlx_completor *init_rmem_completor( 
static void hfa384x_cb_status(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx)

{

	if (ctlx->usercb) {

		hfa384x_cmdresult_t cmdresult;

		struct hfa384x_cmdresult cmdresult;



		if (ctlx->state != CTLX_COMPLETE) {

			memset(&cmdresult, 0, sizeof(cmdresult));
@@ -1497,7 +1497,7 @@ hfa384x_dowrid(hfa384x_t *hw, 
		kfree(ctlx);

	} else if (mode == DOWAIT) {

		struct usbctlx_cmd_completor completor;

		hfa384x_cmdresult_t wridresult;

		struct hfa384x_cmdresult wridresult;



		result = hfa384x_usbctlx_complete_sync(hw,

						       ctlx,
@@ -1679,7 +1679,7 @@ hfa384x_dowmem(hfa384x_t *hw, 
		kfree(ctlx);

	} else if (mode == DOWAIT) {

		struct usbctlx_cmd_completor completor;

		hfa384x_cmdresult_t wmemresult;

		struct hfa384x_cmdresult wmemresult;



		result = hfa384x_usbctlx_complete_sync(hw,

						       ctlx,