From patchwork Fri Aug 15 16:23:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himangi Saraogi X-Patchwork-Id: 380324 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F0091140093 for ; Sat, 16 Aug 2014 02:23:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751649AbaHOQXb (ORCPT ); Fri, 15 Aug 2014 12:23:31 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:40072 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751196AbaHOQXa (ORCPT ); Fri, 15 Aug 2014 12:23:30 -0400 Received: by mail-pd0-f179.google.com with SMTP id v10so3579396pde.38 for ; Fri, 15 Aug 2014 09:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=ZWWtUYuinLX6GXlOXMvqHpXQtCtLb3kddrHAgCGl2P0=; b=atEBS15n75KSEVNAPc5VZVg0tXgLBDgNf6dRxFmAZvyIIWU9vupE2BtUpMQ0X4oUut sS7jSwBpasEv3b+gq/jOWT4M1QtLgZyUYzPdqlNWYDTCOKhlJlSkQ4kIPOXksKE8I0s2 2uFinzCiqkR0mT9yBKzs1UqjRkwOqAjI9aT4oTqqqVgKYDN/CK5/Sq6FkxhCiTBLtNJ2 cX0msNeRtwFBCy9pzeq3KPDyGs7QLp6zWNUNx86AtfCQMS7SW98rBs+2JZwTQAqksBYH 2QDLBB5VjMCL8+xKkmlkgP9PlS0Wt/NKVu1xO/Aw0cvNRZwK3DR4A7WLD1YfWGiXT0ya mALw== X-Received: by 10.69.20.97 with SMTP id hb1mr12363129pbd.150.1408119809444; Fri, 15 Aug 2014 09:23:29 -0700 (PDT) Received: from localhost ([14.139.82.6]) by mx.google.com with ESMTPSA id ak1sm8376845pbc.58.2014.08.15.09.23.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 15 Aug 2014 09:23:28 -0700 (PDT) Date: Fri, 15 Aug 2014 21:53:24 +0530 From: Himangi Saraogi To: "John W. Linville" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Julia Lawall Subject: [PATCH] orinoco_usb: use USB API functions rather than constants Message-ID: <20140815162324.GA7162@himangi-Dell> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch introduces the use of the functions usb_endpoint_is_bulk_in(epd) and usb_endpoint_is_bulk_out(epd). The semantic patch that makes these changes is as follows: @@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\)) == - \(USB_ENDPOINT_XFER_BULK\|2\)) + usb_endpoint_xfer_bulk(epd) @@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) == - \(USB_DIR_IN\|0x80\)) + usb_endpoint_dir_in(epd) @@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) == - \(USB_DIR_OUT\|0\)) + usb_endpoint_dir_out(epd) @@ struct usb_endpoint_descriptor *epd; @@ - (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd)) + usb_endpoint_is_bulk_in(epd) @@ struct usb_endpoint_descriptor *epd; @@ - (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd)) + usb_endpoint_is_bulk_out(epd) Signed-off-by: Himangi Saraogi Acked-by: Julia Lawall --- drivers/net/wireless/orinoco/orinoco_usb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index d3cf7c3..f4b784f 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c @@ -1605,10 +1605,7 @@ static int ezusb_probe(struct usb_interface *interface, for (i = 0; i < iface_desc->bNumEndpoints; ++i) { ep = &interface->altsetting[0].endpoint[i].desc; - if (((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) - == USB_DIR_IN) && - ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - == USB_ENDPOINT_XFER_BULK)) { + if (usb_endpoint_is_bulk_in(ep)) { /* we found a bulk in endpoint */ if (upriv->read_urb != NULL) { pr_warning("Found a second bulk in ep, ignored"); @@ -1636,10 +1633,7 @@ static int ezusb_probe(struct usb_interface *interface, } } - if (((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) - == USB_DIR_OUT) && - ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - == USB_ENDPOINT_XFER_BULK)) { + if (usb_endpoint_is_bulk_out(ep)) { /* we found a bulk out endpoint */ if (upriv->bap_buf != NULL) { pr_warning("Found a second bulk out ep, ignored");