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

Commit 5f046456 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: wlang-ng: avoid new typedef: hfa384x_compident_t 



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

It applies for typedef hfa384x_compident_t

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

drivers/staging/wlan-ng/hfa384x.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -367,12 +367,12 @@ Configuration Record Structures: 
--------------------------------------------------------------------*/

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





/*-- Hardware/Firmware Component Information ----------*/

/*-- Hardware/Firmware Component Information ----------*/

typedef struct hfa384x_compident {

struct hfa384x_compident {

	u16 id;

	u16 id;

	u16 variant;

	u16 variant;

	u16 major;

	u16 major;

	u16 minor;

	u16 minor;

} __packed hfa384x_compident_t;

} __packed;





typedef struct hfa384x_caplevel {

typedef struct hfa384x_caplevel {

	u16 role;

	u16 role;
@@ -1304,10 +1304,10 @@ typedef struct hfa384x { 
	unsigned int dot11_grpcnt;

	unsigned int dot11_grpcnt;





	/* Component Identities */

	/* Component Identities */

	hfa384x_compident_t ident_nic;

	struct hfa384x_compident ident_nic;

	hfa384x_compident_t ident_pri_fw;

	struct hfa384x_compident ident_pri_fw;

	hfa384x_compident_t ident_sta_fw;

	struct hfa384x_compident ident_sta_fw;

	hfa384x_compident_t ident_ap_fw;

	struct hfa384x_compident ident_ap_fw;

	u16 mm_mods;

	u16 mm_mods;





	/* Supplier compatibility ranges */

	/* Supplier compatibility ranges */

drivers/staging/wlan-ng/prism2fw.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -96,10 +96,10 @@ struct s3inforec { 
	u16 len;

	u16 len;

	u16 type;

	u16 type;

	union {

	union {

		hfa384x_compident_t version;

		struct hfa384x_compident version;

		hfa384x_caplevel_t compat;

		hfa384x_caplevel_t compat;

		u16 buildseq;

		u16 buildseq;

		hfa384x_compident_t platform;

		struct hfa384x_compident platform;

	} info;

	} info;

};

};
@@ -152,7 +152,7 @@ static struct imgchunk fchunk[CHUNKS_MAX]; 
/* PDA, built from [card|newfile]+[addfile1+addfile2...] */

/* PDA, built from [card|newfile]+[addfile1+addfile2...] */





static struct pda pda;

static struct pda pda;

static hfa384x_compident_t nicid;

static struct hfa384x_compident nicid;

static hfa384x_caplevel_t rfid;

static hfa384x_caplevel_t rfid;

static hfa384x_caplevel_t macid;

static hfa384x_caplevel_t macid;

static hfa384x_caplevel_t priid;

static hfa384x_caplevel_t priid;

drivers/staging/wlan-ng/prism2sta.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -593,7 +593,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev) 
	/* NIC identity */

	/* NIC identity */

	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICIDENTITY,

	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICIDENTITY,

					&hw->ident_nic,

					&hw->ident_nic,

					sizeof(hfa384x_compident_t));

					sizeof(struct hfa384x_compident));

	if (result) {

	if (result) {

		netdev_err(wlandev->netdev, "Failed to retrieve NICIDENTITY\n");

		netdev_err(wlandev->netdev, "Failed to retrieve NICIDENTITY\n");

		goto failed;

		goto failed;
@@ -612,7 +612,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev) 
	/* Primary f/w identity */

	/* Primary f/w identity */

	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRIIDENTITY,

	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRIIDENTITY,

					&hw->ident_pri_fw,

					&hw->ident_pri_fw,

					sizeof(hfa384x_compident_t));

					sizeof(struct hfa384x_compident));

	if (result) {

	if (result) {

		netdev_err(wlandev->netdev, "Failed to retrieve PRIIDENTITY\n");

		netdev_err(wlandev->netdev, "Failed to retrieve PRIIDENTITY\n");

		goto failed;

		goto failed;
@@ -631,7 +631,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev) 
	/* Station (Secondary?) f/w identity */

	/* Station (Secondary?) f/w identity */

	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STAIDENTITY,

	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STAIDENTITY,

					&hw->ident_sta_fw,

					&hw->ident_sta_fw,

					sizeof(hfa384x_compident_t));

					sizeof(struct hfa384x_compident));

	if (result) {

	if (result) {

		netdev_err(wlandev->netdev, "Failed to retrieve STAIDENTITY\n");

		netdev_err(wlandev->netdev, "Failed to retrieve STAIDENTITY\n");

		goto failed;

		goto failed;