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

Commit 5850c251 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: Remove unnecessary macro 



Remove unnecessary macro SUBMIT_URB by replacing it with a direct call
to usb_submit_urb()

This change was made with the help of the following Coccinelle semantic
patch:

//<smpl>
@@
identifier f,g;
@@
* #define f(...) g(...)
// </smpl>

Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bbbdc23e

drivers/staging/wlan-ng/hfa384x_usb.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -126,8 +126,6 @@ 
#include <linux/usb.h>

#include <linux/usb.h>

#include <linux/byteorder/generic.h>

#include <linux/byteorder/generic.h>





#define SUBMIT_URB(u, f)  usb_submit_urb(u, f)



#include "p80211types.h"

#include "p80211types.h"

#include "p80211hdr.h"

#include "p80211hdr.h"

#include "p80211mgmt.h"

#include "p80211mgmt.h"
@@ -346,7 +344,7 @@ static int submit_rx_urb(hfa384x_t *hw, gfp_t memflags) 
	result = -ENOLINK;

	result = -ENOLINK;

	if (!hw->wlandev->hwremoved &&

	if (!hw->wlandev->hwremoved &&

	    !test_bit(WORK_RX_HALT, &hw->usb_flags)) {

	    !test_bit(WORK_RX_HALT, &hw->usb_flags)) {

		result = SUBMIT_URB(&hw->rx_urb, memflags);

		result = usb_submit_urb(&hw->rx_urb, memflags);





		/* Check whether we need to reset the RX pipe */

		/* Check whether we need to reset the RX pipe */

		if (result == -EPIPE) {

		if (result == -EPIPE) {
@@ -395,7 +393,7 @@ static int submit_tx_urb(hfa384x_t *hw, struct urb *tx_urb, gfp_t memflags) 
	if (netif_running(netdev)) {

	if (netif_running(netdev)) {

		if (!hw->wlandev->hwremoved &&

		if (!hw->wlandev->hwremoved &&

		    !test_bit(WORK_TX_HALT, &hw->usb_flags)) {

		    !test_bit(WORK_TX_HALT, &hw->usb_flags)) {

			result = SUBMIT_URB(tx_urb, memflags);

			result = usb_submit_urb(tx_urb, memflags);





			/* Test whether we need to reset the TX pipe */

			/* Test whether we need to reset the TX pipe */

			if (result == -EPIPE) {

			if (result == -EPIPE) {
@@ -2925,7 +2923,7 @@ static void hfa384x_usbctlxq_run(hfa384x_t *hw) 
		hw->ctlx_urb.transfer_flags |= USB_QUEUE_BULK;

		hw->ctlx_urb.transfer_flags |= USB_QUEUE_BULK;





		/* Now submit the URB and update the CTLX's state */

		/* Now submit the URB and update the CTLX's state */

		result = SUBMIT_URB(&hw->ctlx_urb, GFP_ATOMIC);

		result = usb_submit_urb(&hw->ctlx_urb, GFP_ATOMIC);

		if (result == 0) {

		if (result == 0) {

			/* This CTLX is now running on the active queue */

			/* This CTLX is now running on the active queue */

			head->state = CTLX_REQ_SUBMITTED;

			head->state = CTLX_REQ_SUBMITTED;