diff options
Diffstat (limited to 'drivers/usb/net/pegasus.c')
-rw-r--r-- | drivers/usb/net/pegasus.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c index 918cf5a77c08..33abbd2176b6 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/usb/net/pegasus.c | |||
@@ -96,7 +96,7 @@ MODULE_DEVICE_TABLE(usb, pegasus_ids); | |||
96 | 96 | ||
97 | static int update_eth_regs_async(pegasus_t *); | 97 | static int update_eth_regs_async(pegasus_t *); |
98 | /* Aargh!!! I _really_ hate such tweaks */ | 98 | /* Aargh!!! I _really_ hate such tweaks */ |
99 | static void ctrl_callback(struct urb *urb, struct pt_regs *regs) | 99 | static void ctrl_callback(struct urb *urb) |
100 | { | 100 | { |
101 | pegasus_t *pegasus = urb->context; | 101 | pegasus_t *pegasus = urb->context; |
102 | 102 | ||
@@ -605,7 +605,7 @@ static inline struct sk_buff *pull_skb(pegasus_t * pegasus) | |||
605 | return NULL; | 605 | return NULL; |
606 | } | 606 | } |
607 | 607 | ||
608 | static void read_bulk_callback(struct urb *urb, struct pt_regs *regs) | 608 | static void read_bulk_callback(struct urb *urb) |
609 | { | 609 | { |
610 | pegasus_t *pegasus = urb->context; | 610 | pegasus_t *pegasus = urb->context; |
611 | struct net_device *net; | 611 | struct net_device *net; |
@@ -764,7 +764,7 @@ done: | |||
764 | spin_unlock_irqrestore(&pegasus->rx_pool_lock, flags); | 764 | spin_unlock_irqrestore(&pegasus->rx_pool_lock, flags); |
765 | } | 765 | } |
766 | 766 | ||
767 | static void write_bulk_callback(struct urb *urb, struct pt_regs *regs) | 767 | static void write_bulk_callback(struct urb *urb) |
768 | { | 768 | { |
769 | pegasus_t *pegasus = urb->context; | 769 | pegasus_t *pegasus = urb->context; |
770 | struct net_device *net = pegasus->net; | 770 | struct net_device *net = pegasus->net; |
@@ -801,7 +801,7 @@ static void write_bulk_callback(struct urb *urb, struct pt_regs *regs) | |||
801 | netif_wake_queue(net); | 801 | netif_wake_queue(net); |
802 | } | 802 | } |
803 | 803 | ||
804 | static void intr_callback(struct urb *urb, struct pt_regs *regs) | 804 | static void intr_callback(struct urb *urb) |
805 | { | 805 | { |
806 | pegasus_t *pegasus = urb->context; | 806 | pegasus_t *pegasus = urb->context; |
807 | struct net_device *net; | 807 | struct net_device *net; |
@@ -1226,7 +1226,7 @@ static void pegasus_set_multicast(struct net_device *net) | |||
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | pegasus->flags |= ETH_REGS_CHANGE; | 1228 | pegasus->flags |= ETH_REGS_CHANGE; |
1229 | ctrl_callback(pegasus->ctrl_urb, NULL); | 1229 | ctrl_callback(pegasus->ctrl_urb); |
1230 | } | 1230 | } |
1231 | 1231 | ||
1232 | static __u8 mii_phy_probe(pegasus_t * pegasus) | 1232 | static __u8 mii_phy_probe(pegasus_t * pegasus) |
@@ -1433,11 +1433,11 @@ static int pegasus_resume (struct usb_interface *intf) | |||
1433 | if (netif_running(pegasus->net)) { | 1433 | if (netif_running(pegasus->net)) { |
1434 | pegasus->rx_urb->status = 0; | 1434 | pegasus->rx_urb->status = 0; |
1435 | pegasus->rx_urb->actual_length = 0; | 1435 | pegasus->rx_urb->actual_length = 0; |
1436 | read_bulk_callback(pegasus->rx_urb, NULL); | 1436 | read_bulk_callback(pegasus->rx_urb); |
1437 | 1437 | ||
1438 | pegasus->intr_urb->status = 0; | 1438 | pegasus->intr_urb->status = 0; |
1439 | pegasus->intr_urb->actual_length = 0; | 1439 | pegasus->intr_urb->actual_length = 0; |
1440 | intr_callback(pegasus->intr_urb, NULL); | 1440 | intr_callback(pegasus->intr_urb); |
1441 | } | 1441 | } |
1442 | queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check, | 1442 | queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check, |
1443 | CARRIER_CHECK_DELAY); | 1443 | CARRIER_CHECK_DELAY); |