Commit d0fe1911 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

Staging: otus: use USB API functions rather than constants 

This set of patches introduces calls to the following set of functions:

usb_endpoint_dir_in(epd)
usb_endpoint_dir_out(epd)
usb_endpoint_is_bulk_in(epd)
usb_endpoint_is_bulk_out(epd)
usb_endpoint_is_int_in(epd)
usb_endpoint_is_int_out(epd)
usb_endpoint_num(epd)
usb_endpoint_type(epd)
usb_endpoint_xfer_bulk(epd)
usb_endpoint_xfer_control(epd)
usb_endpoint_xfer_int(epd)
usb_endpoint_xfer_isoc(epd)

In some cases, introducing one of these functions is not possible, and it
just replaces an explicit integer value by one of the following constants:

USB_ENDPOINT_XFER_BULK
USB_ENDPOINT_XFER_CONTROL
USB_ENDPOINT_XFER_INT
USB_ENDPOINT_XFER_ISOC

An extract of the semantic patch that makes these changes is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@r1@ struct usb_endpoint_descriptor *epd; @@

- ((epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\)) ==
- \(USB_ENDPOINT_XFER_CONTROL\|0\))
+ usb_endpoint_xfer_control(epd)

@r5@ struct usb_endpoint_descriptor *epd; @@

- ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) ==
-  \(USB_DIR_IN\|0x80\))
+ usb_endpoint_dir_in(epd)

@inc@
@@

#include <linux/usb.h>

@depends on !inc && (r1||r5)@
@@

+ #include <linux/usb.h>
  #include <linux/usb/...>
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1472dc9b

drivers/staging/otus/usbdrv.c

+4 −8
Original line number Diff line number Diff line
@@ -936,30 +936,26 @@ int zfLnxAllocAllUrbs(struct usbdrv_private *macp) 
    for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i)

    {

        endpoint = &iface_desc->endpoint[i].desc;

        if ((endpoint->bEndpointAddress & 0x80) &&

            ((endpoint->bmAttributes & 3) == 0x02))

	 if (usb_endpoint_is_bulk_in(endpoint))

        {

            /* we found a bulk in endpoint */

            printk(KERN_ERR "bulk in: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));

        }



        if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&

            ((endpoint->bmAttributes & 3) == 0x02))

	 if (usb_endpoint_is_bulk_out(endpoint))

        {

            /* we found a bulk out endpoint */

            printk(KERN_ERR "bulk out: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));

        }



        if ((endpoint->bEndpointAddress & 0x80) &&

            ((endpoint->bmAttributes & 3) == 0x03))

	 if (usb_endpoint_is_int_in(endpoint))

        {

            /* we found a interrupt in endpoint */

            printk(KERN_ERR "interrupt in: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));

            printk(KERN_ERR "interrupt in: int_interval = %d\n", endpoint->bInterval);

        }



        if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&

            ((endpoint->bmAttributes & 3) == 0x03))

	 if (usb_endpoint_is_int_out(endpoint))

        {

            /* we found a interrupt out endpoint */

            printk(KERN_ERR "interrupt out: wMaxPacketSize = %x\n", le16_to_cpu(endpoint->wMaxPacketSize));