From patchwork Thu Mar 2 13:45:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaejoong Kim X-Patchwork-Id: 9600305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9B5C8600CB for ; Thu, 2 Mar 2017 13:55:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DAC0279B3 for ; Thu, 2 Mar 2017 13:55:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8222328589; Thu, 2 Mar 2017 13:55:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8356B279B3 for ; Thu, 2 Mar 2017 13:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752664AbdCBNy1 (ORCPT ); Thu, 2 Mar 2017 08:54:27 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35061 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752604AbdCBNyX (ORCPT ); Thu, 2 Mar 2017 08:54:23 -0500 Received: by mail-pf0-f193.google.com with SMTP id 67so2460920pfg.2 for ; Thu, 02 Mar 2017 05:54:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YH44AOV4iCjSWePAjA9+fQxSvnKvIXycoYWy2KN1dEQ=; b=md6hh/vi6GdVwyGNKoKCQ+jPzMTi/KYrjeQnYCnUsSJPfFweGOMEKT/aXlc1nYD5Qm 9mUTeC/bt6bpZnM4HA6Dl0fhIBdiAi6G0yUB1+bzN8hONexdQGZln5St2IJ7qud+OT2D /fpJm7zsOAt8COdA+yg1H6IrH88wIggPIT1FABL5KvV/20XpT94JPap5NLBg+Oq2vZMN qL5/uks48x7FzImBlKFiZW8Et50Kj6LdADgkqjpvqaYozSZ/QkDY1O5eEM/K8vkECIfp lLhhh7rxsfJqnZlzY6N08ihDhOvH5ZZjjXuw5nU/KwZd98sXfKduGQpPUalCPBy64L+i Dnmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YH44AOV4iCjSWePAjA9+fQxSvnKvIXycoYWy2KN1dEQ=; b=LIuwh5gVcshkLRBXvwjau592c5Fv49VQvDDCCfCGEpN3zyze6XgP8btDjrJ1XliZY7 ps7KQglo/zors8mS44M00spOd78T83haRdrbfRsxRzhqwfHvQxE28Tsx//hWixD5Pzwe FuCu/Tu89rTKRzCtXtfG04PWnVsQrVxyd85ZH5J3jjfcD+Eu2Y8HUg6LOZ2+zuWdgqfC gM+o0Q8iNe+OFMHBQfJtFLLv/1y3WRQVHg6xNiUn3q3M9GDg2BXC4lhzgHEQfuEjd1vh /ffmksEjNzSYPdED4XgzgOczHa0wp84e4dnXuXy20e9SPOrtWQB7VS4k3TWsqac+Mwpx B4pw== X-Gm-Message-State: AMke39mnTdbqCKkFoo7qYma/k0SgxTpZHPbe5vp7wsaOLUGK8eBpD4zM+J1+Fa5xBUNRsA== X-Received: by 10.98.69.139 with SMTP id n11mr15569640pfi.65.1488462363130; Thu, 02 Mar 2017 05:46:03 -0800 (PST) Received: from localhost.localdomain ([27.122.242.72]) by smtp.gmail.com with ESMTPSA id v9sm5530537pfg.133.2017.03.02.05.46.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Mar 2017 05:46:02 -0800 (PST) From: Jaejoong Kim To: jikos@kernel.org, benjamin.tissoires@redhat.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Jaejoong Kim Subject: [PATCH 2/2] HID: hiddev: store hiddev's minor number when hiddev is connected Date: Thu, 2 Mar 2017 22:45:30 +0900 Message-Id: <1488462330-12349-3-git-send-email-climbbb.kim@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488462330-12349-1-git-send-email-climbbb.kim@gmail.com> References: <1488462330-12349-1-git-send-email-climbbb.kim@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The hid-core announces kernel message which driver is loaded if there is a hiddev, but hiddev's minor number is always zero even though it's not zero. So, 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. Signed-off-by: Jaejoong Kim --- drivers/hid/hid-core.c | 2 +- drivers/hid/usbhid/hiddev.c | 26 +++----------------------- include/linux/hiddev.h | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index e9e87d3..1a0b910 100644 --- 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 5c2c489..ef83d68 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -44,29 +44,6 @@ #define HIDDEV_MINOR_BASE 96 #define HIDDEV_MINORS 16 #endif -#define HIDDEV_BUFFER_SIZE 2048 - -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; -}; - -struct hiddev_list { - struct hiddev_usage_ref buffer[HIDDEV_BUFFER_SIZE]; - int head; - int tail; - unsigned flags; - struct fasync_struct *fasync; - struct hiddev *hiddev; - struct list_head node; - struct mutex thread_lock; -}; /* * Find a report, given the report's type and ID. The ID can be specified @@ -911,6 +888,9 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) kfree(hiddev); return -1; } + + hiddev->minor = usbhid->intf->minor; + return 0; } diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h index a5dd814..ff3701b 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h @@ -32,6 +32,30 @@ * In-kernel definitions. */ +#define HIDDEV_BUFFER_SIZE 2048 + +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; +}; + +struct hiddev_list { + struct hiddev_usage_ref buffer[HIDDEV_BUFFER_SIZE]; + int head; + int tail; + unsigned flags; + struct fasync_struct *fasync; + struct hiddev *hiddev; + struct list_head node; + struct mutex thread_lock; +}; + struct hid_device; struct hid_usage; struct hid_field;