From: Sergio Paracuellos Date: Wed, 28 Sep 2016 18:19:21 +0000 (+0200) Subject: staging: wlang-ng: avoid new typedef: hfa384x_InfFrame_t X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f69de9e3fc07571f0c05041dafb839274949fe77;p=linux-beck.git staging: wlang-ng: avoid new typedef: hfa384x_InfFrame_t 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 7accea2dba78..29d9bc54d801 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -774,11 +774,11 @@ union hfa384x_infodata { 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 @@ typedef struct hfa384x_usb_rxfrm { 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 @@ typedef struct hfa384x { 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 5a4bc75d40a1..a275e97e75d7 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.h +++ b/drivers/staging/wlan-ng/prism2mgmt.h @@ -65,7 +65,7 @@ extern int prism2_reset_settletime; 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 bc3941c211fc..59f461919f73 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -111,25 +111,25 @@ static int prism2sta_setmulticast(struct wlandevice *wlandev, struct net_device *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 @@ -962,7 +962,7 @@ exit: * interrupt */ static void prism2sta_inf_handover(struct wlandevice *wlandev, - hfa384x_InfFrame_t *inf) + struct hfa384x_InfFrame *inf) { pr_debug("received infoframe:HANDOVER (unhandled)\n"); } @@ -985,7 +985,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; @@ -1031,7 +1031,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; @@ -1086,7 +1086,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; @@ -1099,7 +1099,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; @@ -1127,7 +1127,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; @@ -1179,10 +1179,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); } @@ -1440,7 +1440,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; @@ -1468,7 +1468,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; @@ -1529,7 +1529,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; @@ -1544,7 +1544,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; @@ -1718,7 +1718,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; @@ -1742,7 +1742,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 */