staging: wlang-ng: avoid new typedef: hfa384x_caplevel_t

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

It applies for typedef hfa384x_caplevel_t

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 5ca2a9474e5a618e5eeb7f997c2ed271ba061491..e02f8948d5539afb77d94d84e685152a084aa35f 100644 (file)
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -386,13 +386,13 @@ struct hfa384x_compident {
        u16 minor;
 } __packed;
 
-typedef struct hfa384x_caplevel {
+struct hfa384x_caplevel {
        u16 role;
        u16 id;
        u16 variant;
        u16 bottom;
        u16 top;
-} __packed hfa384x_caplevel_t;
+} __packed;
 
 /*-- Configuration Record: cnfAuthentication --*/
 #define HFA384x_CNFAUTHENTICATION_OPENSYSTEM   0x0001
@@ -1337,31 +1337,31 @@ typedef struct hfa384x {
        u16 mm_mods;
 
        /* Supplier compatibility ranges */
-       hfa384x_caplevel_t cap_sup_mfi;
-       hfa384x_caplevel_t cap_sup_cfi;
-       hfa384x_caplevel_t cap_sup_pri;
-       hfa384x_caplevel_t cap_sup_sta;
-       hfa384x_caplevel_t cap_sup_ap;
+       struct hfa384x_caplevel cap_sup_mfi;
+       struct hfa384x_caplevel cap_sup_cfi;
+       struct hfa384x_caplevel cap_sup_pri;
+       struct hfa384x_caplevel cap_sup_sta;
+       struct hfa384x_caplevel cap_sup_ap;
 
        /* Actor compatibility ranges */
-       hfa384x_caplevel_t cap_act_pri_cfi;     /*
+       struct hfa384x_caplevel cap_act_pri_cfi;        /*
                                                 * pri f/w to controller
                                                 * interface
                                                 */
 
-       hfa384x_caplevel_t cap_act_sta_cfi;     /*
+       struct hfa384x_caplevel cap_act_sta_cfi;        /*
                                                 * sta f/w to controller
                                                 * interface
                                                 */
 
-       hfa384x_caplevel_t cap_act_sta_mfi;     /* sta f/w to modem interface */
+       struct hfa384x_caplevel cap_act_sta_mfi;        /* sta f/w to modem interface */
 
-       hfa384x_caplevel_t cap_act_ap_cfi;      /*
+       struct hfa384x_caplevel cap_act_ap_cfi; /*
                                                 * ap f/w to controller
                                                 * interface
                                                 */
 
-       hfa384x_caplevel_t cap_act_ap_mfi;      /* ap f/w to modem interface */
+       struct hfa384x_caplevel cap_act_ap_mfi; /* ap f/w to modem interface */
 
        u32 psusercount;        /* Power save user count. */
        hfa384x_CommTallies32_t tallies;        /* Communication tallies. */

diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index 35b0ff996df7c9954393c761dbf58c8f71475d05..ca322fa3d43cf10fcd26b135fc3589ee7c8901b4 100644 (file)
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -97,7 +97,7 @@ struct s3inforec {
        u16 type;
        union {
                struct hfa384x_compident version;
-               hfa384x_caplevel_t compat;
+               struct hfa384x_caplevel compat;
                u16 buildseq;
                struct hfa384x_compident platform;
        } info;
@@ -153,9 +153,9 @@ static struct imgchunk fchunk[CHUNKS_MAX];
 
 static struct pda pda;
 static struct hfa384x_compident nicid;
-static hfa384x_caplevel_t rfid;
-static hfa384x_caplevel_t macid;
-static hfa384x_caplevel_t priid;
+static struct hfa384x_caplevel rfid;
+static struct hfa384x_caplevel macid;
+static struct hfa384x_caplevel priid;
 
 /*================================================================*/
 /* Local Function Declarations */

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 0dbdba88e18a515f033a28cc8eeeb9390c6e5867..850cbbc9159c1a6f3ee97b2a35ee4a12b0f839e2 100644 (file)
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -671,7 +671,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
        /* Compatibility range, Modem supplier */
        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_MFISUPRANGE,
                                        &hw->cap_sup_mfi,
-                                       sizeof(hfa384x_caplevel_t));
+                                       sizeof(struct hfa384x_caplevel));
        if (result) {
                netdev_err(wlandev->netdev, "Failed to retrieve MFISUPRANGE\n");
                goto failed;
@@ -695,7 +695,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
        /* Compatibility range, Controller supplier */
        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CFISUPRANGE,
                                        &hw->cap_sup_cfi,
-                                       sizeof(hfa384x_caplevel_t));
+                                       sizeof(struct hfa384x_caplevel));
        if (result) {
                netdev_err(wlandev->netdev, "Failed to retrieve CFISUPRANGE\n");
                goto failed;
@@ -719,7 +719,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
        /* Compatibility range, Primary f/w supplier */
        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRISUPRANGE,
                                        &hw->cap_sup_pri,
-                                       sizeof(hfa384x_caplevel_t));
+                                       sizeof(struct hfa384x_caplevel));
        if (result) {
                netdev_err(wlandev->netdev, "Failed to retrieve PRISUPRANGE\n");
                goto failed;
@@ -743,7 +743,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
        /* Compatibility range, Station f/w supplier */
        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STASUPRANGE,
                                        &hw->cap_sup_sta,
-                                       sizeof(hfa384x_caplevel_t));
+                                       sizeof(struct hfa384x_caplevel));
        if (result) {
                netdev_err(wlandev->netdev, "Failed to retrieve STASUPRANGE\n");
                goto failed;
@@ -775,7 +775,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
        /* Compatibility range, primary f/w actor, CFI supplier */
        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRI_CFIACTRANGES,
                                        &hw->cap_act_pri_cfi,
-                                       sizeof(hfa384x_caplevel_t));
+                                       sizeof(struct hfa384x_caplevel));
        if (result) {
                netdev_err(wlandev->netdev, "Failed to retrieve PRI_CFIACTRANGES\n");
                goto failed;
@@ -799,7 +799,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
        /* Compatibility range, sta f/w actor, CFI supplier */
        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STA_CFIACTRANGES,
                                        &hw->cap_act_sta_cfi,
-                                       sizeof(hfa384x_caplevel_t));
+                                       sizeof(struct hfa384x_caplevel));
        if (result) {
                netdev_err(wlandev->netdev, "Failed to retrieve STA_CFIACTRANGES\n");
                goto failed;
@@ -823,7 +823,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
        /* Compatibility range, sta f/w actor, MFI supplier */
        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STA_MFIACTRANGES,
                                        &hw->cap_act_sta_mfi,
-                                       sizeof(hfa384x_caplevel_t));
+                                       sizeof(struct hfa384x_caplevel));
        if (result) {
                netdev_err(wlandev->netdev, "Failed to retrieve STA_MFIACTRANGES\n");
                goto failed;