From patchwork Fri Mar 3 08:54:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaejoong Kim X-Patchwork-Id: 9602221 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 B9D3E604E2 for ; Fri, 3 Mar 2017 08:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACED527C14 for ; Fri, 3 Mar 2017 08:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1344285F5; Fri, 3 Mar 2017 08:57:55 +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=ham 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 7CD0927C14 for ; Fri, 3 Mar 2017 08:57:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751690AbdCCI5f (ORCPT ); Fri, 3 Mar 2017 03:57:35 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:34512 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751143AbdCCI5d (ORCPT ); Fri, 3 Mar 2017 03:57:33 -0500 Received: by mail-pg0-f67.google.com with SMTP id s67so12079863pgb.1; Fri, 03 Mar 2017 00:55:08 -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=/9sBOkvu6sKLw/Ay4BqQ1dM6b4N4GFsjsVDNJRM1iYQ=; b=nI6osdFPfzEXJ7rZBxT0DyjDDzbYWNiYLQUfYbB7qWrT6LaXkcPfQPWiGMbeCJuMpX iVM83uOaVoFSv3jqypjnCV0fZHVrZ+OrzHuTh9u5btePKcs2YSfmBfYoJCs6jFq55QrK cn7LrcT32Ba9HcMoX2MBzJ4U2hhR8qCCXTBh7oxFjaQla5uJYxkNFntU5hcPdyQcMxn/ K6N3UQzijx6KoZ06239HRa9TYQcZIJm5VGOy/GDfsUQ8/Bdv9WMnzV9tVbpllJ1WX0zg daiHK2OoCb2wbNkzc1Gse+3SWTOWhYH3KLfhCE6Ir3P50yEifNzCQOc+tfVWMjbQ7HPK FGvA== 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=/9sBOkvu6sKLw/Ay4BqQ1dM6b4N4GFsjsVDNJRM1iYQ=; b=YCD4vr4/Lgs9yjeDCa2L9DmIF+RTQGJZMn9Yp+3MDmM9Y1+JwItmXvpA1MvVBkPfbo MGThX6/Xe2zwVjtO1URLaoDUYcTyefsuL+y40Kx7ff/m5Brd5bU0bzTa9pG4FwB2Jtwv W3KViUBnyBQrGdcf/hOYUZGhO0MOV8cjllhcTAKgHuiVAvQiNRUPfBYqloeHDsQWq2bX RYowVyRnn7JU4GWRSGfh/C1qaP0ieaDo4ea4gwFIXWsjtE0OAMMluRFdrCtrVHcmOMKs /DUaxC9KtW0SDNHT6S/4RZ/ZXr4kGSbQjawNhAlhUrLr3y0qGE2fGTELZCwfuvK/F7MQ ISwA== X-Gm-Message-State: AMke39ly0ua1f1BvmARZWczElUjMk0lW6QGbLFvR5nqxoBeTgrIz6VZAWX4k4AGqSdwjWQ== X-Received: by 10.84.236.74 with SMTP id h10mr477151pln.13.1488531307604; Fri, 03 Mar 2017 00:55:07 -0800 (PST) Received: from localhost.localdomain ([27.122.242.72]) by smtp.gmail.com with ESMTPSA id n63sm21791380pfk.64.2017.03.03.00.55.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Mar 2017 00:55:07 -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 v2 2/2] HID: hiddev: reallocate hiddev's minor number Date: Fri, 3 Mar 2017 17:54:01 +0900 Message-Id: <1488531241-18367-3-git-send-email-climbbb.kim@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488531241-18367-1-git-send-email-climbbb.kim@gmail.com> References: <1488531241-18367-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 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. Reviewed-by: Benjamin Tissoires Signed-off-by: Jaejoong Kim --- Chanes in v2: - rollback struct hiddev_list exported - squash this patch in a seperate patch --- drivers/hid/hid-core.c | 2 +- drivers/hid/usbhid/hiddev.c | 15 ++++----------- include/linux/hid.h | 1 - include/linux/hiddev.h | 11 +++++++++++ 4 files changed, 16 insertions(+), 13 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 700145b..27721c3 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -44,17 +44,7 @@ #define HIDDEV_MINOR_BASE 96 #define HIDDEV_MINORS 16 #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; -}; +#define HIDDEV_BUFFER_SIZE 2048 struct hiddev_list { struct hiddev_usage_ref buffer[HIDDEV_BUFFER_SIZE]; @@ -910,6 +900,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/hid.h b/include/linux/hid.h index 28f38e2b8..643c017 100644 --- 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 a5dd814..fb407da 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h @@ -32,6 +32,17 @@ * 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; +}; + struct hid_device; struct hid_usage; struct hid_field;