Skip to content

Commit

Permalink
HID: API - fix leftovers of hidinput API in USB HID
Browse files Browse the repository at this point in the history
hidinput_{open,close}() functions do not belong to usbhid, but
to the generic HID layer. Move them, and fix hooks in struct
hid_device, so that now the callbacks are done to transport-specific
_open() functions, but not input_open() functions.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Jiri Kosina committed Feb 5, 2007
1 parent c080d89 commit 7c37914
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
16 changes: 14 additions & 2 deletions drivers/hid/hid-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,18 @@ int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int
}
EXPORT_SYMBOL_GPL(hidinput_find_field);

static int hidinput_open(struct input_dev *dev)
{
struct hid_device *hid = dev->private;
return hid->hid_open(hid);
}

static void hidinput_close(struct input_dev *dev)
{
struct hid_device *hid = dev->private;
hid->hid_close(hid);
}

/*
* Register the input device; print a message.
* Configure the input layer interface
Expand Down Expand Up @@ -851,8 +863,8 @@ int hidinput_connect(struct hid_device *hid)

input_dev->private = hid;
input_dev->event = hid->hidinput_input_event;
input_dev->open = hid->hidinput_open;
input_dev->close = hid->hidinput_close;
input_dev->open = hidinput_open;
input_dev->close = hidinput_close;

input_dev->name = hid->name;
input_dev->phys = hid->phys;
Expand Down
16 changes: 2 additions & 14 deletions drivers/usb/input/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,18 +529,6 @@ void usbhid_close(struct hid_device *hid)
usb_kill_urb(usbhid->urbin);
}

static int hidinput_open(struct input_dev *dev)
{
struct hid_device *hid = dev->private;
return usbhid_open(hid);
}

static void hidinput_close(struct input_dev *dev)
{
struct hid_device *hid = dev->private;
usbhid_close(hid);
}

#define USB_VENDOR_ID_PANJIT 0x134c

#define USB_VENDOR_ID_TURBOX 0x062a
Expand Down Expand Up @@ -1241,8 +1229,8 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
usbhid->urbctrl->transfer_dma = usbhid->ctrlbuf_dma;
usbhid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
hid->hidinput_input_event = usb_hidinput_input_event;
hid->hidinput_open = hidinput_open;
hid->hidinput_close = hidinput_close;
hid->hid_open = usbhid_open;
hid->hid_close = usbhid_close;
#ifdef CONFIG_USB_HIDDEV
hid->hiddev_hid_event = hiddev_hid_event;
hid->hiddev_report_event = hiddev_report_event;
Expand Down
4 changes: 2 additions & 2 deletions include/linux/hid.h
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ struct hid_device { /* device report descriptor */

/* device-specific function pointers */
int (*hidinput_input_event) (struct input_dev *, unsigned int, unsigned int, int);
int (*hidinput_open) (struct input_dev *);
void (*hidinput_close) (struct input_dev *);
int (*hid_open) (struct hid_device *);
void (*hid_close) (struct hid_device *);

/* hiddev event handler */
void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
Expand Down

0 comments on commit 7c37914

Please sign in to comment.