lkml.org 
[lkml]   [2016]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 45/87] staging: wlang-ng: avoid new typedef: hfa384x_usbin_t
Date
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: Sergio Paracuellos <sergio.paracuellos@gmail.com>
---
drivers/staging/wlan-ng/hfa384x.h | 6 +++---
drivers/staging/wlan-ng/hfa384x_usb.c | 21 +++++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 2365edc..f715f5f 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -909,7 +909,7 @@ struct hfa384x_usb_error {
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 @@ struct hfa384x_usb_error {
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 void (*ctlx_usercb_t) (struct hfa384x *hw,

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 */

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index d76ec2a..9203880 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -169,13 +169,13 @@ enum cmd_mode {
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);
--
1.9.1
\
 
 \ /
  Last update: 2016-09-28 20:34    [W:0.381 / U:0.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site