git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
input
/
usbkbd.c
diff --git
a/drivers/usb/input/usbkbd.c
b/drivers/usb/input/usbkbd.c
index
2f3edc2
..
8505824
100644
(file)
--- a/
drivers/usb/input/usbkbd.c
+++ b/
drivers/usb/input/usbkbd.c
@@
-29,10
+29,8
@@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/input.h>
#include <linux/init.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
/*
* Version Information
/*
* Version Information
@@
-82,7
+80,7
@@
struct usb_kbd {
dma_addr_t leds_dma;
};
dma_addr_t leds_dma;
};
-static void usb_kbd_irq(struct urb *urb
, struct pt_regs *regs
)
+static void usb_kbd_irq(struct urb *urb)
{
struct usb_kbd *kbd = urb->context;
int i;
{
struct usb_kbd *kbd = urb->context;
int i;
@@
-99,8
+97,6
@@
static void usb_kbd_irq(struct urb *urb, struct pt_regs *regs)
goto resubmit;
}
goto resubmit;
}
- input_regs(kbd->dev, regs);
-
for (i = 0; i < 8; i++)
input_report_key(kbd->dev, usb_kbd_keycode[i + 224], (kbd->new[0] >> i) & 1);
for (i = 0; i < 8; i++)
input_report_key(kbd->dev, usb_kbd_keycode[i + 224], (kbd->new[0] >> i) & 1);
@@
-126,7
+122,7
@@
static void usb_kbd_irq(struct urb *urb, struct pt_regs *regs)
memcpy(kbd->old, kbd->new, 8);
resubmit:
memcpy(kbd->old, kbd->new, 8);
resubmit:
- i = usb_submit_urb (urb,
SLAB
_ATOMIC);
+ i = usb_submit_urb (urb,
GFP
_ATOMIC);
if (i)
err ("can't resubmit intr, %s-%s/input0, status %d",
kbd->usbdev->bus->bus_name,
if (i)
err ("can't resubmit intr, %s-%s/input0, status %d",
kbd->usbdev->bus->bus_name,
@@
-160,7
+156,7
@@
static int usb_kbd_event(struct input_dev *dev, unsigned int type,
return 0;
}
return 0;
}
-static void usb_kbd_led(struct urb *urb
, struct pt_regs *regs
)
+static void usb_kbd_led(struct urb *urb)
{
struct usb_kbd *kbd = urb->context;
{
struct usb_kbd *kbd = urb->context;
@@
-200,11
+196,11
@@
static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd)
return -1;
if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL)))
return -1;
return -1;
if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL)))
return -1;
- if (!(kbd->new = usb_buffer_alloc(dev, 8,
SLAB
_ATOMIC, &kbd->new_dma)))
+ if (!(kbd->new = usb_buffer_alloc(dev, 8,
GFP
_ATOMIC, &kbd->new_dma)))
return -1;
return -1;
- if (!(kbd->cr = usb_buffer_alloc(dev, sizeof(struct usb_ctrlrequest),
SLAB
_ATOMIC, &kbd->cr_dma)))
+ if (!(kbd->cr = usb_buffer_alloc(dev, sizeof(struct usb_ctrlrequest),
GFP
_ATOMIC, &kbd->cr_dma)))
return -1;
return -1;
- if (!(kbd->leds = usb_buffer_alloc(dev, 1,
SLAB
_ATOMIC, &kbd->leds_dma)))
+ if (!(kbd->leds = usb_buffer_alloc(dev, 1,
GFP
_ATOMIC, &kbd->leds_dma)))
return -1;
return 0;
return -1;
return 0;
@@
-212,10
+208,8
@@
static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd)
static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd)
{
static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd)
{
- if (kbd->irq)
- usb_free_urb(kbd->irq);
- if (kbd->led)
- usb_free_urb(kbd->led);
+ usb_free_urb(kbd->irq);
+ usb_free_urb(kbd->led);
if (kbd->new)
usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
if (kbd->cr)
if (kbd->new)
usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
if (kbd->cr)
@@
-240,9
+234,7
@@
static int usb_kbd_probe(struct usb_interface *iface,
return -ENODEV;
endpoint = &interface->endpoint[0].desc;
return -ENODEV;
endpoint = &interface->endpoint[0].desc;
- if (!(endpoint->bEndpointAddress & USB_DIR_IN))
- return -ENODEV;
- if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT)
+ if (!usb_endpoint_is_int_in(endpoint))
return -ENODEV;
pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
return -ENODEV;
pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);