projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
usb
/
net
/
usbnet.c
diff --git
a/drivers/usb/net/usbnet.c
b/drivers/usb/net/usbnet.c
index
760b532
..
327f975
100644
(file)
--- a/
drivers/usb/net/usbnet.c
+++ b/
drivers/usb/net/usbnet.c
@@
-116,7
+116,7
@@
int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
e = alt->endpoint + ep;
switch (e->desc.bmAttributes) {
case USB_ENDPOINT_XFER_INT:
e = alt->endpoint + ep;
switch (e->desc.bmAttributes) {
case USB_ENDPOINT_XFER_INT:
- if (!
(e->desc.bEndpointAddress & USB_DIR_IN
))
+ if (!
usb_endpoint_dir_in(&e->desc
))
continue;
intr = 1;
/* FALLTHROUGH */
continue;
intr = 1;
/* FALLTHROUGH */
@@
-125,7
+125,7
@@
int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
default:
continue;
}
default:
continue;
}
- if (
e->desc.bEndpointAddress & USB_DIR_IN
) {
+ if (
usb_endpoint_dir_in(&e->desc)
) {
if (!intr && !in)
in = e;
else if (intr && !status)
if (!intr && !in)
in = e;
else if (intr && !status)
@@
-782,9
+782,10
@@
static struct ethtool_ops usbnet_ethtool_ops = {
* especially now that control transfers can be queued.
*/
static void
* especially now that control transfers can be queued.
*/
static void
-kevent (
void *data
)
+kevent (
struct work_struct *work
)
{
{
- struct usbnet *dev = data;
+ struct usbnet *dev =
+ container_of(work, struct usbnet, kevent);
int status;
/* usb_clear_halt() needs a thread context */
int status;
/* usb_clear_halt() needs a thread context */
@@
-1146,7
+1147,7
@@
usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
skb_queue_head_init (&dev->done);
dev->bh.func = usbnet_bh;
dev->bh.data = (unsigned long) dev;
skb_queue_head_init (&dev->done);
dev->bh.func = usbnet_bh;
dev->bh.data = (unsigned long) dev;
- INIT_WORK (&dev->kevent, kevent
, dev
);
+ INIT_WORK (&dev->kevent, kevent);
dev->delay.function = usbnet_bh;
dev->delay.data = (unsigned long) dev;
init_timer (&dev->delay);
dev->delay.function = usbnet_bh;
dev->delay.data = (unsigned long) dev;
init_timer (&dev->delay);