diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/usb/net/rtl8150.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/usb/net/rtl8150.c')
| -rw-r--r-- | drivers/usb/net/rtl8150.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index 2364c2099387..72171f94ded4 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c | |||
| @@ -208,7 +208,7 @@ static int set_registers(rtl8150_t * dev, u16 indx, u16 size, void *data) | |||
| 208 | indx, 0, data, size, 500); | 208 | indx, 0, data, size, 500); |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | static void ctrl_callback(struct urb *urb, struct pt_regs *regs) | 211 | static void ctrl_callback(struct urb *urb) |
| 212 | { | 212 | { |
| 213 | rtl8150_t *dev; | 213 | rtl8150_t *dev; |
| 214 | 214 | ||
| @@ -415,7 +415,7 @@ static inline struct sk_buff *pull_skb(rtl8150_t *dev) | |||
| 415 | return NULL; | 415 | return NULL; |
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | static void read_bulk_callback(struct urb *urb, struct pt_regs *regs) | 418 | static void read_bulk_callback(struct urb *urb) |
| 419 | { | 419 | { |
| 420 | rtl8150_t *dev; | 420 | rtl8150_t *dev; |
| 421 | unsigned pkt_len, res; | 421 | unsigned pkt_len, res; |
| @@ -525,7 +525,7 @@ tlsched: | |||
| 525 | tasklet_schedule(&dev->tl); | 525 | tasklet_schedule(&dev->tl); |
| 526 | } | 526 | } |
| 527 | 527 | ||
| 528 | static void write_bulk_callback(struct urb *urb, struct pt_regs *regs) | 528 | static void write_bulk_callback(struct urb *urb) |
| 529 | { | 529 | { |
| 530 | rtl8150_t *dev; | 530 | rtl8150_t *dev; |
| 531 | 531 | ||
| @@ -541,7 +541,7 @@ static void write_bulk_callback(struct urb *urb, struct pt_regs *regs) | |||
| 541 | netif_wake_queue(dev->netdev); | 541 | netif_wake_queue(dev->netdev); |
| 542 | } | 542 | } |
| 543 | 543 | ||
| 544 | static void intr_callback(struct urb *urb, struct pt_regs *regs) | 544 | static void intr_callback(struct urb *urb) |
| 545 | { | 545 | { |
| 546 | rtl8150_t *dev; | 546 | rtl8150_t *dev; |
| 547 | __u8 *d; | 547 | __u8 *d; |
| @@ -617,11 +617,11 @@ static int rtl8150_resume(struct usb_interface *intf) | |||
| 617 | if (netif_running(dev->netdev)) { | 617 | if (netif_running(dev->netdev)) { |
| 618 | dev->rx_urb->status = 0; | 618 | dev->rx_urb->status = 0; |
| 619 | dev->rx_urb->actual_length = 0; | 619 | dev->rx_urb->actual_length = 0; |
| 620 | read_bulk_callback(dev->rx_urb, NULL); | 620 | read_bulk_callback(dev->rx_urb); |
| 621 | 621 | ||
| 622 | dev->intr_urb->status = 0; | 622 | dev->intr_urb->status = 0; |
| 623 | dev->intr_urb->actual_length = 0; | 623 | dev->intr_urb->actual_length = 0; |
| 624 | intr_callback(dev->intr_urb, NULL); | 624 | intr_callback(dev->intr_urb); |
| 625 | } | 625 | } |
| 626 | return 0; | 626 | return 0; |
| 627 | } | 627 | } |