[PATCH 28/87] staging: wlang-ng: avoid new typedef: hfa384x_InfFrame_t

From: Sergio Paracuellos
Date: Wed Sep 28 2016 - 14:31:56 EST


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

It applies for typedef hfa384x_InfFrame_t

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@xxxxxxxxx>
---
drivers/staging/wlan-ng/hfa384x.h | 8 +++---
drivers/staging/wlan-ng/prism2mgmt.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 48 ++++++++++++++++++------------------
3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 7accea2..29d9bc5 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -774,11 +774,11 @@ struct hfa384x_KeyIDChanged {
struct hfa384x_KeyIDChanged keyidchanged;
} __packed;

-typedef struct hfa384x_InfFrame {
+struct hfa384x_InfFrame {
u16 framelen;
u16 infotype;
union hfa384x_infodata info;
-} __packed hfa384x_InfFrame_t;
+} __packed;

/*--------------------------------------------------------------------
* USB Packet structures and constants.
@@ -862,7 +862,7 @@ struct hfa384x_KeyIDChanged {

typedef struct hfa384x_usb_infofrm {
u16 type;
- hfa384x_InfFrame_t info;
+ struct hfa384x_InfFrame info;
} __packed hfa384x_usb_infofrm_t;

typedef struct hfa384x_usb_statusresp {
@@ -1374,7 +1374,7 @@ struct prism2sta_accesslist {
struct hfa384x_ChInfoResult results;
} channel_info;

- hfa384x_InfFrame_t *scanresults;
+ struct hfa384x_InfFrame *scanresults;

struct prism2sta_authlist authlist; /* Authenticated station list. */
unsigned int accessmode; /* Access mode. */
diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h
index 5a4bc75..a275e97 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.h
+++ b/drivers/staging/wlan-ng/prism2mgmt.h
@@ -65,7 +65,7 @@

u32 prism2sta_ifstate(struct wlandevice *wlandev, u32 ifstate);

-void prism2sta_ev_info(struct wlandevice *wlandev, hfa384x_InfFrame_t *inf);
+void prism2sta_ev_info(struct wlandevice *wlandev, struct hfa384x_InfFrame *inf);
void prism2sta_ev_txexc(struct wlandevice *wlandev, u16 status);
void prism2sta_ev_tx(struct wlandevice *wlandev, u16 status);
void prism2sta_ev_alloc(struct wlandevice *wlandev);
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index fb47b82..d483fd1 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -110,25 +110,25 @@ static int prism2sta_txframe(struct wlandevice *wlandev, struct sk_buff *skb,
static int prism2sta_setmulticast(struct wlandevice *wlandev, netdevice_t *dev);

static void prism2sta_inf_handover(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_tallies(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_authreq(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);
static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf);
+ struct hfa384x_InfFrame *inf);

/*
* prism2sta_open
@@ -960,7 +960,7 @@ static int prism2sta_setmulticast(struct wlandevice *wlandev, netdevice_t *dev)
* interrupt
*/
static void prism2sta_inf_handover(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
pr_debug("received infoframe:HANDOVER (unhandled)\n");
}
@@ -983,7 +983,7 @@ static void prism2sta_inf_handover(struct wlandevice *wlandev,
* interrupt
*/
static void prism2sta_inf_tallies(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;
u16 *src16;
@@ -1029,7 +1029,7 @@ static void prism2sta_inf_tallies(struct wlandevice *wlandev,
* interrupt
*/
static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;
int nbss;
@@ -1084,7 +1084,7 @@ static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
* interrupt
*/
static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;
int nbss;
@@ -1097,7 +1097,7 @@ static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,

kfree(hw->scanresults);

- hw->scanresults = kmemdup(inf, sizeof(hfa384x_InfFrame_t), GFP_ATOMIC);
+ hw->scanresults = kmemdup(inf, sizeof(struct hfa384x_InfFrame), GFP_ATOMIC);

if (nbss == 0)
nbss = -1;
@@ -1125,7 +1125,7 @@ static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
* interrupt
*/
static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;
unsigned int i, n;
@@ -1177,10 +1177,10 @@ void prism2sta_processing_defer(struct work_struct *data)
/* First let's process the auth frames */
{
struct sk_buff *skb;
- hfa384x_InfFrame_t *inf;
+ struct hfa384x_InfFrame *inf;

while ((skb = skb_dequeue(&hw->authq))) {
- inf = (hfa384x_InfFrame_t *)skb->data;
+ inf = (struct hfa384x_InfFrame *)skb->data;
prism2sta_inf_authreq_defer(wlandev, inf);
}

@@ -1438,7 +1438,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* interrupt
*/
static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;

@@ -1466,7 +1466,7 @@ static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
* interrupt
*/
static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;
struct hfa384x_AssocStatus rec;
@@ -1527,7 +1527,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
*
*/
static void prism2sta_inf_authreq(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;
struct sk_buff *skb;
@@ -1542,7 +1542,7 @@ static void prism2sta_inf_authreq(struct wlandevice *wlandev,
}

static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;
struct hfa384x_authenticateStation_data rec;
@@ -1716,7 +1716,7 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
* interrupt
*/
static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,
- hfa384x_InfFrame_t *inf)
+ struct hfa384x_InfFrame *inf)
{
hfa384x_t *hw = wlandev->priv;

@@ -1740,7 +1740,7 @@ static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,
* Call context:
* interrupt
*/
-void prism2sta_ev_info(struct wlandevice *wlandev, hfa384x_InfFrame_t *inf)
+void prism2sta_ev_info(struct wlandevice *wlandev, struct hfa384x_InfFrame *inf)
{
inf->infotype = le16_to_cpu(inf->infotype);
/* Dispatch */
--
1.9.1