mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 83/87] staging: wlang-ng: avoid new typedef: hfa384x_usbctlx_t
@ 2016-09-28 17:17 Sergio Paracuellos
  0 siblings, 0 replies; 2+ messages in thread
From: Sergio Paracuellos @ 2016-09-28 17:17 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

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

It applies for typedef hfa384x_usbctlx_t

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
---
 drivers/staging/wlan-ng/hfa384x.h     |  4 +--
 drivers/staging/wlan-ng/hfa384x_usb.c | 54 +++++++++++++++++------------------
 drivers/staging/wlan-ng/prism2usb.c   |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 9390fdd..f38b195 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -1179,7 +1179,7 @@ enum ctlx_state {
 typedef void (*ctlx_usercb_t) (struct hfa384x *hw,
 			       void *ctlxresult, void *usercb_data);
 
-typedef struct hfa384x_usbctlx {
+struct hfa384x_usbctlx {
 	struct list_head list;
 
 	size_t outbufsize;
@@ -1196,7 +1196,7 @@ typedef void (*ctlx_usercb_t) (struct hfa384x *hw,
 	void *usercb_data;	/*  at CTLX completion  */
 
 	int variant;		/* Identifies cmd variant */
-} hfa384x_usbctlx_t;
+};
 
 typedef struct hfa384x_usbctlxq {
 	spinlock_t lock;
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 17a90c5..1f0c428 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -193,9 +193,9 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, union hfa384x_usbin *usbin,
 
 static void hfa384x_usbctlx_reaper_task(unsigned long data);
 
-static int hfa384x_usbctlx_submit(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
+static int hfa384x_usbctlx_submit(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx);
 
-static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
+static void unlocked_usbctlx_complete(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx);
 
 struct usbctlx_completor {
 	int (*complete)(struct usbctlx_completor *);
@@ -203,13 +203,13 @@ struct usbctlx_completor {
 
 static int
 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-			      hfa384x_usbctlx_t *ctlx,
+			      struct hfa384x_usbctlx *ctlx,
 			      struct usbctlx_completor *completor);
 
 static int
-unlocked_usbctlx_cancel_async(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
+unlocked_usbctlx_cancel_async(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx);
 
-static void hfa384x_cb_status(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx);
+static void hfa384x_cb_status(hfa384x_t *hw, const struct hfa384x_usbctlx *ctlx);
 
 static int
 usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp,
@@ -278,9 +278,9 @@ static inline const char *ctlxstr(CTLX_STATE s)
 	return ctlx_str[s];
 };
 
-static inline hfa384x_usbctlx_t *get_active_ctlx(hfa384x_t *hw)
+static inline struct hfa384x_usbctlx *get_active_ctlx(hfa384x_t *hw)
 {
-	return list_entry(hw->ctlxq.active.next, hfa384x_usbctlx_t, list);
+	return list_entry(hw->ctlxq.active.next, struct hfa384x_usbctlx, list);
 }
 
 #ifdef DEBUG_USB
@@ -608,9 +608,9 @@ void hfa384x_destroy(hfa384x_t *hw)
 		dev_kfree_skb(skb);
 }
 
-static hfa384x_usbctlx_t *usbctlx_alloc(void)
+static struct hfa384x_usbctlx *usbctlx_alloc(void)
 {
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 
 	ctlx = kzalloc(sizeof(*ctlx),
 		       in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
@@ -795,7 +795,7 @@ static inline struct usbctlx_completor *init_rmem_completor(
 * Call context:
 *	interrupt
 ----------------------------------------------------------------*/
-static void hfa384x_cb_status(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx)
+static void hfa384x_cb_status(hfa384x_t *hw, const struct hfa384x_usbctlx *ctlx)
 {
 	if (ctlx->usercb) {
 		struct hfa384x_cmdresult cmdresult;
@@ -1174,7 +1174,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)
 *	process
 ----------------------------------------------------------------*/
 static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-					 hfa384x_usbctlx_t *ctlx,
+					 struct hfa384x_usbctlx *ctlx,
 					 struct usbctlx_completor *completor)
 {
 	unsigned long flags;
@@ -1295,7 +1295,7 @@ static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
 	      ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data)
 {
 	int result;
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 
 	ctlx = usbctlx_alloc();
 	if (!ctlx) {
@@ -1385,7 +1385,7 @@ static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
 	       ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data)
 {
 	int result;
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 
 	ctlx = usbctlx_alloc();
 	if (!ctlx) {
@@ -1466,7 +1466,7 @@ static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
 	       ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data)
 {
 	int result;
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 
 	ctlx = usbctlx_alloc();
 	if (!ctlx) {
@@ -1554,7 +1554,7 @@ static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
 	       ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data)
 {
 	int result;
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 
 	ctlx = usbctlx_alloc();
 	if (!ctlx) {
@@ -1645,7 +1645,7 @@ static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
 	       ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data)
 {
 	int result;
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 
 	pr_debug("page=0x%04x offset=0x%04x len=%d\n", page, offset, len);
 
@@ -2691,7 +2691,7 @@ void hfa384x_tx_timeout(struct wlandevice *wlandev)
 static void hfa384x_usbctlx_reaper_task(unsigned long data)
 {
 	hfa384x_t *hw = (hfa384x_t *)data;
-	hfa384x_usbctlx_t *ctlx, *temp;
+	struct hfa384x_usbctlx *ctlx, *temp;
 	unsigned long flags;
 
 	spin_lock_irqsave(&hw->ctlxq.lock, flags);
@@ -2724,7 +2724,7 @@ static void hfa384x_usbctlx_reaper_task(unsigned long data)
 static void hfa384x_usbctlx_completion_task(unsigned long data)
 {
 	hfa384x_t *hw = (hfa384x_t *)data;
-	hfa384x_usbctlx_t *ctlx, *temp;
+	struct hfa384x_usbctlx *ctlx, *temp;
 	unsigned long flags;
 
 	int reap = 0;
@@ -2798,7 +2798,7 @@ static void hfa384x_usbctlx_completion_task(unsigned long data)
 *	Either process or interrupt, but presumably interrupt
 ----------------------------------------------------------------*/
 static int unlocked_usbctlx_cancel_async(hfa384x_t *hw,
-					 hfa384x_usbctlx_t *ctlx)
+					 struct hfa384x_usbctlx *ctlx)
 {
 	int ret;
 
@@ -2847,7 +2847,7 @@ static int unlocked_usbctlx_cancel_async(hfa384x_t *hw,
 * Call context:
 *	Either, assume interrupt
 ----------------------------------------------------------------*/
-static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx)
+static void unlocked_usbctlx_complete(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx)
 {
 	/* Timers have been stopped, and ctlx should be in
 	 * a terminal state. Retire it from the "active"
@@ -2905,12 +2905,12 @@ static void hfa384x_usbctlxq_run(hfa384x_t *hw)
 		goto unlock;
 
 	while (!list_empty(&hw->ctlxq.pending)) {
-		hfa384x_usbctlx_t *head;
+		struct hfa384x_usbctlx *head;
 		int result;
 
 		/* This is the first pending command */
 		head = list_entry(hw->ctlxq.pending.next,
-				  hfa384x_usbctlx_t, list);
+				  struct hfa384x_usbctlx, list);
 
 		/* We need to split this off to avoid a race condition */
 		list_move_tail(&head->list, &hw->ctlxq.active);
@@ -3169,7 +3169,7 @@ static void hfa384x_usbin_callback(struct urb *urb)
 static void hfa384x_usbin_ctlx(hfa384x_t *hw, union hfa384x_usbin *usbin,
 			       int urb_status)
 {
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 	int run_queue = 0;
 	unsigned long flags;
 
@@ -3622,7 +3622,7 @@ static void hfa384x_ctlxout_callback(struct urb *urb)
 	int delete_resptimer = 0;
 	int timer_ok = 1;
 	int run_queue = 0;
-	hfa384x_usbctlx_t *ctlx;
+	struct hfa384x_usbctlx *ctlx;
 	unsigned long flags;
 
 	pr_debug("urb->status=%d\n", urb->status);
@@ -3766,7 +3766,7 @@ static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
 		 */
 		hw->ctlx_urb.transfer_flags |= URB_ASYNC_UNLINK;
 		if (usb_unlink_urb(&hw->ctlx_urb) == -EINPROGRESS) {
-			hfa384x_usbctlx_t *ctlx = get_active_ctlx(hw);
+			struct hfa384x_usbctlx *ctlx = get_active_ctlx(hw);
 
 			ctlx->state = CTLX_REQ_FAILED;
 
@@ -3818,7 +3818,7 @@ static void hfa384x_usbctlx_resptimerfn(unsigned long data)
 	 * adapter has been unplugged ...
 	 */
 	if (!list_empty(&hw->ctlxq.active)) {
-		hfa384x_usbctlx_t *ctlx = get_active_ctlx(hw);
+		struct hfa384x_usbctlx *ctlx = get_active_ctlx(hw);
 
 		if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0) {
 			spin_unlock_irqrestore(&hw->ctlxq.lock, flags);
@@ -3886,7 +3886,7 @@ static void hfa384x_usb_throttlefn(unsigned long data)
 * Call context:
 *	process or interrupt
 ----------------------------------------------------------------*/
-static int hfa384x_usbctlx_submit(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx)
+static int hfa384x_usbctlx_submit(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx)
 {
 	unsigned long flags;
 
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index 3561487..81831d3 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -139,7 +139,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
 	wlandev = (struct wlandevice *)usb_get_intfdata(interface);
 	if (wlandev) {
 		LIST_HEAD(cleanlist);
-		hfa384x_usbctlx_t *ctlx, *temp;
+		struct hfa384x_usbctlx *ctlx, *temp;
 		unsigned long flags;
 
 		hfa384x_t *hw = wlandev->priv;
-- 
1.9.1

^ permalink raw reply	[flat|nested] 2+ messages in thread
* [PATCH 00/87] Fix some style warnings in hfa384x.h
@ 2016-09-28 18:18 Sergio Paracuellos
  2016-09-28 18:20 ` [PATCH 83/87] staging: wlang-ng: avoid new typedef: hfa384x_usbctlx_t Sergio Paracuellos
  0 siblings, 1 reply; 2+ messages in thread
From: Sergio Paracuellos @ 2016-09-28 18:18 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

This patch series fix some warnings reported by checkpatch.pl script in hfa384x.h:
WARNING: Block comments use * on subsequent lines
WARNING: Block comments use a trailing */ on a separate line
WARNING: do not add new typedefs

Sergio Paracuellos (87):
  staging: wlang-ng: avoid new typedef: hfa384x_bytestr32_t
  staging: wlang-ng: avoid new typedef: hfa384x_compident_t
  staging: wlang-ng: Fix block comments style warnings in hfa384x.h
  staging: wlang-ng: avoid new typedef: hfa384x_caplevel_t
  staging: wlang-ng: avoid new typedef: hfa384x_HostScanRequest_data_t
  staging: wlang-ng: avoid new typedef: hfa384x_JoinRequest_data_t
  staging: wlang-ng: avoid new typedef:
    hfa384x_authenticateStation_data_t
  staging: wlang-ng: avoid new typedef: hfa384x_WPAData_t
  staging: wlang-ng: avoid new typedef: hfa384x_downloadbuffer_t
  staging: wlang-ng: avoid new typedef: hfa384x_commsquality_t
  staging: wlang-ng: avoid new typedef: hfa384x_dbmcommsquality_t
  staging: wlang-ng: avoid new typedef: hfa384x_tx_frame_t
  staging: wlang-ng: avoid new typedef: hfa384x_rx_frame_t
  staging: wlang-ng: avoid new typedef: hfa384x_CommTallies16_t
  staging: wlang-ng: avoid new typedef: hfa384x_CommTallies32_t
  staging: wlang-ng: avoid new typedef: hfa384x_ScanResultSub_t
  staging: wlang-ng: avoid new typedef: hfa384x_ScanResult_t
  staging: wlang-ng: avoid new typedef: hfa384x_ChInfoResultSub_t
  staging: wlang-ng: avoid new typedef: hfa384x_ChInfoResult_t
  staging: wlang-ng: avoid new typedef: hfa384x_HScanResultSub_t
  staging: wlang-ng: avoid new typedef: hfa384x_HScanResult_t
  staging: wlang-ng: avoid new typedef: hfa384x_LinkStatus_t
  staging: wlang-ng: avoid new typedef: hfa384x_AssocStatus_t
  staging: wlang-ng: avoid new typedef: hfa384x_AuthReq_t
  staging: wlang-ng: avoid new typedef: hfa384x_PSUserCount_t
  staging: wlang-ng: avoid new typedef: hfa384x_KeyIDChanged_t
  staging: wlang-ng: avoid new typedef: hfa384x_infodata_t
  staging: wlang-ng: avoid new typedef: hfa384x_InfFrame_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_txfrm_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_cmdreq_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_wridreq_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_rridreq_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_wmemreq_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_rmemreq_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_rxfrm_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_infofrm_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_cmdresp_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_wridresp_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_rridresp_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_wmemresp_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_rmemresp_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_bufavail_t
  staging: wlang-ng: avoid new typedef: hfa384x_usb_error_t
  staging: wlang-ng: avoid new typedef: hfa384x_usbout_t
  staging: wlang-ng: avoid new typedef: hfa384x_usbin_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_pcb_partnum_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_pcb_tracenum_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_nic_serial_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_mkk_measurements_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_nic_ramsize_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_mfisuprange_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_cfisuprange_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_nicid_t
  staging: wlang-ng: avoid new typedef:
    hfa384x_pdr_refdac_measurements_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_vgdac_measurements_t
  staging: wlang-ng: avoid new typedef:
    hfa384x_pdr_level_compc_measurements_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_mac_address_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_mkk_callname_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_regdomain_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_allowed_channel_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_default_channel_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_privacy_option_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_temptype_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_refdac_setup_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_vgdac_setup_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_level_comp_setup_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_trimdac_setup_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_ifr_setting_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_rfr_setting_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_hfa3861_baseline_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_hfa3861_shadow_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_hfa3861_ifrf_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_hfa3861_chcalsp_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_hfa3861_chcali_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_nic_config_t
  staging: wlang-ng: avoid new typedef: hfa384x_hfo_delay_t
  staging: wlang-ng: avoid new typedef:
    hfa384x_pdr_hfa3861_manf_testsp_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_hfa3861_manf_testi_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdr_end_of_pda_t
  staging: wlang-ng: avoid new typedef: hfa384x_pdrec_t
  staging: wlang-ng: avoid new typedef: hfa384x_cmdresult_t
  staging: wlang-ng: avoid new typedef: hfa384x_rridresult_t
  staging: wlang-ng: avoid new typedef: hfa384x_usbctlx_t
  staging: wlang-ng: avoid new typedef: hfa384x_usbctlxq_t
  staging: wlang-ng: avoid new typedef: hfa384x_metacmd_t
  staging: wlang-ng: avoid new typedef: hfa384x_t
  staging: wlang-ng: Fix block comments style warnings in hfa384x.h

 drivers/staging/wlan-ng/hfa384x.h     | 874 +++++++++++++++++-----------------
 drivers/staging/wlan-ng/hfa384x_usb.c | 293 ++++++------
 drivers/staging/wlan-ng/prism2fw.c    |  22 +-
 drivers/staging/wlan-ng/prism2mgmt.c  |  26 +-
 drivers/staging/wlan-ng/prism2mgmt.h  |   7 +-
 drivers/staging/wlan-ng/prism2mib.c   |  38 +-
 drivers/staging/wlan-ng/prism2sta.c   | 130 ++---
 drivers/staging/wlan-ng/prism2usb.c   |  10 +-
 8 files changed, 712 insertions(+), 688 deletions(-)

-- 
1.9.1

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-28 18:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-28 17:17 [PATCH 83/87] staging: wlang-ng: avoid new typedef: hfa384x_usbctlx_t Sergio Paracuellos
2016-09-28 18:18 [PATCH 00/87] Fix some style warnings in hfa384x.h Sergio Paracuellos
2016-09-28 18:20 ` [PATCH 83/87] staging: wlang-ng: avoid new typedef: hfa384x_usbctlx_t Sergio Paracuellos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®