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

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

staging: wlang-ng: avoid new typedef: hfa384x_usbin_t 



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

It applies for typedef hfa384x_usbin_t

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

drivers/staging/wlan-ng/hfa384x.h

+3 −3
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ union hfa384x_usbout { 
	struct hfa384x_usb_rmemreq rmemreq;

} __packed;



typedef union hfa384x_usbin {

union hfa384x_usbin {

	__le16 type;

	struct hfa384x_usb_rxfrm rxfrm;

	struct hfa384x_usb_txfrm txfrm;
@@ -922,7 +922,7 @@ typedef union hfa384x_usbin { 
	struct hfa384x_usb_bufavail bufavail;

	struct hfa384x_usb_error usberror;

	u8 boguspad[3000];

} __packed hfa384x_usbin_t;

} __packed;



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

 * PD record structures.
@@ -1184,7 +1184,7 @@ typedef struct hfa384x_usbctlx { 


	size_t outbufsize;

	union hfa384x_usbout outbuf;	/* pkt buf for OUT */

	hfa384x_usbin_t inbuf;	/* pkt buf for IN(a copy) */

	union hfa384x_usbin inbuf;	/* pkt buf for IN(a copy) */



	CTLX_STATE state;	/* Tracks running state */

drivers/staging/wlan-ng/hfa384x_usb.c

+11 −10
Original line number Diff line number Diff line
@@ -169,13 +169,13 @@ static void hfa384x_ctlxout_callback(struct urb *urb); 
static void hfa384x_usbin_callback(struct urb *urb);



static void

hfa384x_usbin_txcompl(struct wlandevice *wlandev, hfa384x_usbin_t *usbin);

hfa384x_usbin_txcompl(struct wlandevice *wlandev, union hfa384x_usbin *usbin);



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



static void hfa384x_usbin_info(struct wlandevice *wlandev, hfa384x_usbin_t *usbin);

static void hfa384x_usbin_info(struct wlandevice *wlandev, union hfa384x_usbin *usbin);



static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,

static void hfa384x_usbin_ctlx(hfa384x_t *hw, union hfa384x_usbin *usbin,

			       int urb_status);



/*---------------------------------------------------*/
@@ -327,7 +327,7 @@ static int submit_rx_urb(hfa384x_t *hw, gfp_t memflags) 
	struct sk_buff *skb;

	int result;



	skb = dev_alloc_skb(sizeof(hfa384x_usbin_t));

	skb = dev_alloc_skb(sizeof(union hfa384x_usbin));

	if (!skb) {

		result = -ENOMEM;

		goto done;
@@ -336,7 +336,7 @@ static int submit_rx_urb(hfa384x_t *hw, gfp_t memflags) 
	/* Post the IN urb */

	usb_fill_bulk_urb(&hw->rx_urb, hw->usb,

			  hw->endp_in,

			  skb->data, sizeof(hfa384x_usbin_t),

			  skb->data, sizeof(union hfa384x_usbin),

			  hfa384x_usbin_callback, hw->wlandev);



	hw->rx_urb_skb = skb;
@@ -2990,7 +2990,7 @@ static void hfa384x_usbin_callback(struct urb *urb) 
{

	struct wlandevice *wlandev = urb->context;

	hfa384x_t *hw;

	hfa384x_usbin_t *usbin = (hfa384x_usbin_t *)urb->transfer_buffer;

	union hfa384x_usbin *usbin = (union hfa384x_usbin *)urb->transfer_buffer;

	struct sk_buff *skb = NULL;

	int result;

	int urb_status;
@@ -3166,7 +3166,7 @@ static void hfa384x_usbin_callback(struct urb *urb) 
* Call context:

*	interrupt

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

static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,

static void hfa384x_usbin_ctlx(hfa384x_t *hw, union hfa384x_usbin *usbin,

			       int urb_status)

{

	hfa384x_usbctlx_t *ctlx;
@@ -3286,7 +3286,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin, 
*	interrupt

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

static void hfa384x_usbin_txcompl(struct wlandevice *wlandev,

				  hfa384x_usbin_t *usbin)

				  union hfa384x_usbin *usbin)

{

	u16 status;
@@ -3318,7 +3318,7 @@ static void hfa384x_usbin_txcompl(struct wlandevice *wlandev, 
----------------------------------------------------------------*/

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

{

	hfa384x_usbin_t *usbin = (hfa384x_usbin_t *)skb->data;

	union hfa384x_usbin *usbin = (union hfa384x_usbin *)skb->data;

	hfa384x_t *hw = wlandev->priv;

	int hdrlen;

	struct p80211_rxmeta *rxmeta;
@@ -3517,7 +3517,8 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev, 
* Call context:

*	interrupt

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

static void hfa384x_usbin_info(struct wlandevice *wlandev, hfa384x_usbin_t *usbin)

static void hfa384x_usbin_info(struct wlandevice *wlandev,

			       union hfa384x_usbin *usbin)

{

	usbin->infofrm.info.framelen =

	    le16_to_cpu(usbin->infofrm.info.framelen);