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

Commit 2230c3c8 authored Jan 03, 2009 by Julia Lawall Committed by Mauro Carvalho Chehab Jan 07, 2009

V4L/DVB (10185): Use negated usb_endpoint_xfer_control, etc

This patch extends 13417982 by using
usb_endpoint_xfer_control, usb_endpoint_xfer_isoc, usb_endpoint_xfer_bulk,
and usb_endpoint_xfer_int in the negated case as well.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

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

- (usb_endpoint_type(epd) != \(USB_ENDPOINT_XFER_CONTROL\|0\))
+ !usb_endpoint_xfer_control(epd)

@@ struct usb_endpoint_descriptor *epd; @@

- (usb_endpoint_type(epd) != \(USB_ENDPOINT_XFER_ISOC\|1\))
+ !usb_endpoint_xfer_isoc(epd)

@@ struct usb_endpoint_descriptor *epd; @@

- (usb_endpoint_type(epd) != \(USB_ENDPOINT_XFER_BULK\|2\))
+ !usb_endpoint_xfer_bulk(epd)

@@ struct usb_endpoint_descriptor *epd; @@

- (usb_endpoint_type(epd) != \(USB_ENDPOINT_XFER_INT\|3\))
+ !usb_endpoint_xfer_int(epd)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 439b72b6

drivers/media/video/em28xx/em28xx-cards.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1990,8 +1990,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
		int check_interface = 1;
		isoc_pipe = 1;
		endpoint = &interface->cur_altsetting->endpoint[1].desc;
		if (usb_endpoint_type(endpoint) !=
		USB_ENDPOINT_XFER_ISOC)
		if (!usb_endpoint_xfer_isoc(endpoint))
		check_interface = 0;

		if (usb_endpoint_dir_out(endpoint))

drivers/media/video/usbvideo/ibmcam.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3779,7 +3779,7 @@ static int ibmcam_probe(struct usb_interface intf, const struct usb_device_id
		err("Alternate settings have different endpoint addresses!");
		return -ENODEV;
		}
		if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) {
		if (!usb_endpoint_xfer_isoc(endpoint)) {
		err("Interface %d. has non-ISO endpoint!", ifnum);
		return -ENODEV;
		}

drivers/media/video/usbvideo/konicawc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -823,7 +823,7 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id
		err("Alternate settings have different endpoint addresses!");
		return -ENODEV;
		}
		if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) {
		if (!usb_endpoint_xfer_isoc(endpoint)) {
		err("Interface %d. has non-ISO endpoint!",
		interface->desc.bInterfaceNumber);
		return -ENODEV;

drivers/media/video/usbvideo/ultracam.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -556,7 +556,7 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
		err("Alternate settings have different endpoint addresses!");
		return -ENODEV;
		}
		if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) {
		if (!usb_endpoint_xfer_isoc(endpoint)) {
		err("Interface %d. has non-ISO endpoint!",
		interface->desc.bInterfaceNumber);
		return -ENODEV;

drivers/media/video/usbvision/usbvision-video.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1674,8 +1674,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
		interface = &dev->actconfig->interface[ifnum]->altsetting[0];
		}
		endpoint = &interface->endpoint[1].desc;
		if (usb_endpoint_type(endpoint) !=
		USB_ENDPOINT_XFER_ISOC) {
		if (!usb_endpoint_xfer_isoc(endpoint)) {
		err("%s: interface %d. has non-ISO endpoint!",
		__func__, ifnum);
		err("%s: Endpoint attributes %d",