HID: hiddev: reallocate hiddev's minor number

We need to store the minor number each drivers. In case of hidraw, the
minor number is stored stores in struct hidraw. But hiddev's minor is
located in struct hid_device.

The hid-core driver announces a kernel message which driver is loaded when
HID device connected, but hiddev's minor number is always zero. To proper
display hiddev's minor number, we need to store the minor number asked from
usb core and do some refactoring work (move from hiddev.c to hiddev.h) to
access hiddev in hid-core.

[jkosina@suse.cz: rebase on top of newer codebase]
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jaejoong Kim <climbbb.kim@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e9e87d337446918f672771551f41041755d83d22..1a0b9105748495297699410343b754e020c58ad7 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1695,7 +1695,7 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
                len += sprintf(buf + len, "input");
        if (hdev->claimed & HID_CLAIMED_HIDDEV)
                len += sprintf(buf + len, "%shiddev%d", len ? "," : "",
-                               hdev->minor);
+                               ((struct hiddev *)hdev->hiddev)->minor);
        if (hdev->claimed & HID_CLAIMED_HIDRAW)
                len += sprintf(buf + len, "%shidraw%d", len ? "," : "",
                                ((struct hidraw *)hdev->hidraw)->minor);

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 667171829f65c3abcc0303d2a9f05c38401e6718..a8baaf60e28a44934380757e24cae5c178d060bd 100644 (file)
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -46,17 +46,6 @@
 #endif
 #define HIDDEV_BUFFER_SIZE     2048
 
-struct hiddev {
-       int exist;
-       int open;
-       struct mutex existancelock;
-       wait_queue_head_t wait;
-       struct hid_device *hid;
-       struct list_head list;
-       spinlock_t list_lock;
-       bool initialized;
-};
-
 struct hiddev_list {
        struct hiddev_usage_ref buffer[HIDDEV_BUFFER_SIZE];
        int head;
@@ -923,6 +912,8 @@ int hiddev_connect(struct hid_device *hid, unsigned int force)
         */
        hiddev->initialized = hid->quirks & HID_QUIRK_NO_INIT_REPORTS;
 
+       hiddev->minor = usbhid->intf->minor;
+
        return 0;
 }
 

diff --git a/include/linux/hid.h b/include/linux/hid.h
index b2e472c3e595b6bddddf76ada68582cf369b1ca0..24de54835e5296d231f9a013e43af0c88f34429d 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -541,7 +541,6 @@ struct hid_device {                                                 /* device report descriptor */
        struct list_head inputs;                                        /* The list of inputs */
        void *hiddev;                                                   /* The hiddev structure */
        void *hidraw;
-       int minor;                                                      /* Hiddev minor number */
 
        int open;                                                       /* is the device open by anyone? */
        char name[128];                                                 /* Device name */

diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h
index a5dd8148660b7eb15482c99b1a602226007ec840..9216222229578075168262ac1c0cec5f88619f57 100644 (file)
--- a/include/linux/hiddev.h
+++ b/include/linux/hiddev.h
@@ -32,6 +32,18 @@
  * In-kernel definitions.
  */
 
+struct hiddev {
+       int minor;
+       int exist;
+       int open;
+       struct mutex existancelock;
+       wait_queue_head_t wait;
+       struct hid_device *hid;
+       struct list_head list;
+       spinlock_t list_lock;
+       bool initialized;
+};
+
 struct hid_device;
 struct hid_usage;
 struct hid_field;