From patchwork Thu Jun 8 10:01:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 103365 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2359122qgd; Thu, 8 Jun 2017 03:02:31 -0700 (PDT) X-Received: by 10.84.193.3 with SMTP id e3mr34308253pld.178.1496916151218; Thu, 08 Jun 2017 03:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496916151; cv=none; d=google.com; s=arc-20160816; b=fhgQM+ZMHmCNwL3qIae6iU2IAoYQu6SBuQavswd5CeY9JbbL0BpFPU9XoDmGRuxiLC bv4boBbd/c2WnhKd7B6kbypEf8cgEwWt0FsKbuHpCRS3svmNhs9lgT4fYYca8XQ0sg62 OvV+hRTIOT+G5ulP+vrg0HHh1Ld/Jbk+Mvt0NqIaxVgw2phWpAECMwfhgxHeBQtgy+sM fYwJLTKnECXjrht78L0LyIOOKixXwbeRo99lGkqhLAlk2yZbR45JPvm/NgdRpZcWoIAe /DhEb5Sz16PWNdpdqmHDuG+YRR0Iz4fr1A/CjRIt9QpuMS5ZuuEiEKHURCCWkzbzrFof K7kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=uzPvBXhpjnyVMvrIVIVpXOLVvRVz6aqFHd1uY9b8TZk=; b=HbkVg5miMBK2QIgwYBrc9ZMVSw3qOZgz5YohovTVJ2cYIy+CL16kp+cNzljb9scmah hoc4dVJ5wy5VmOQmVvKhaebpSjJleyYYRDy5hcbbRvlzSjAteo+s2/2hWBPQ0VtDwV3A E48jPGWgE720BoHtQYyXDimNhsF+dJU81ylhicTqUZfQZJH5S9kmkTHFyVlScmyRjzY7 d4Vcwed2e0J0h6dZ7iIsTRABN67NcG4ToOCimwGqmtlsPw05fXB0nOGuJRnpKarQQ9cg 23JhrBjvLfrwcTuF7j8dDA4ecLTsg0tVCuTjHP5uABzSQ4UYqtDTsy6ygWTsNrMrRZEh abVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v87si4052665pfi.61.2017.06.08.03.02.30; Thu, 08 Jun 2017 03:02:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751540AbdFHKCS (ORCPT + 25 others); Thu, 8 Jun 2017 06:02:18 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34255 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751405AbdFHKCQ (ORCPT ); Thu, 8 Jun 2017 06:02:16 -0400 Received: by mail-pf0-f171.google.com with SMTP id 9so15566031pfj.1 for ; Thu, 08 Jun 2017 03:02:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=uzPvBXhpjnyVMvrIVIVpXOLVvRVz6aqFHd1uY9b8TZk=; b=ZBUrg7bDyI/pTMy3/6tGeMA2+FHcf4giVOeRQJf1n3LThnZroH8jDwEL2lPai6tsVV Lo8pA4wRh3gnWSzUVF3y3W4K3D24atITUIXWMJMOhVfkXpY/UK2eLXZ2YUT/dcdRpl1A JZrtDKDF0M6hPgimZM4ry6S0bYZmxYYLS9ydg= 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; bh=uzPvBXhpjnyVMvrIVIVpXOLVvRVz6aqFHd1uY9b8TZk=; b=A42ez5xzX/7sbn10jzXYk+Jwd+w8SAkNjckLjxyYl1NBi3JDYIiszhMP+WW0rwGZ8C sFQSsqzhh3fTk1YpMKeacg0ne8nVU+p6j4/+Xr/hFXwHln6rGoMRnPVvxLyT8a0PEOLr LpWmOsJXk7uxHMT/Z1i9j8RNS6LVk0gnhtV9fzC9iFILgqqobgMqE0gx/I1fI2kavI5i 9cXxUy9/raWW+TYL4j1c5DnZ6Ebxnwc8XvqRC3k86Zq1NjjD6VnGa2EOeu9ZoXBEIRkZ WGSRNwu/7sUYrgCzkn/zjIGeavVb+A998Gy7gwLSfgY5NJqB5FAe1cm2RNmFXdb1e3RI bVcQ== X-Gm-Message-State: AODbwcCBYmq5ANlpDnXZaB4+/stcvrnZo5beAXBIEuWcyDanRaiM13Jy gs1L2DLhhFAtpyf3 X-Received: by 10.99.116.7 with SMTP id p7mr36448749pgc.162.1496916136021; Thu, 08 Jun 2017 03:02:16 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id x27sm10254827pfe.113.2017.06.08.03.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 03:02:15 -0700 (PDT) From: Binoy Jayan To: Binoy Jayan Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Rajendra , Mark Brown , Jiri Kosina , Benjamin Tissoires Subject: [PATCH] HID: Replace semaphore driver_lock with mutex Date: Thu, 8 Jun 2017 15:31:56 +0530 Message-Id: <1496916116-3765-1-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The semaphore 'driver_lock' is used as a simple mutex, so it should be written as one. Semaphores are going away in the future. Signed-off-by: Binoy Jayan --- This patch is part of a bigger effort to eliminate unwanted semaphores from the linux kernel. drivers/hid/hid-core.c | 10 +++++----- include/linux/hid.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- Binoy Jayan diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 37084b6..bf21dac 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2222,7 +2222,7 @@ static int hid_device_probe(struct device *dev) const struct hid_device_id *id; int ret = 0; - if (down_interruptible(&hdev->driver_lock)) + if (mutex_lock_interruptible(&hdev->driver_lock)) return -EINTR; if (down_interruptible(&hdev->driver_input_lock)) { ret = -EINTR; @@ -2254,7 +2254,7 @@ static int hid_device_probe(struct device *dev) if (!hdev->io_started) up(&hdev->driver_input_lock); unlock_driver_lock: - up(&hdev->driver_lock); + mutex_unlock(&hdev->driver_lock); return ret; } @@ -2264,7 +2264,7 @@ static int hid_device_remove(struct device *dev) struct hid_driver *hdrv; int ret = 0; - if (down_interruptible(&hdev->driver_lock)) + if (mutex_lock_interruptible(&hdev->driver_lock)) return -EINTR; if (down_interruptible(&hdev->driver_input_lock)) { ret = -EINTR; @@ -2285,7 +2285,7 @@ static int hid_device_remove(struct device *dev) if (!hdev->io_started) up(&hdev->driver_input_lock); unlock_driver_lock: - up(&hdev->driver_lock); + mutex_unlock(&hdev->driver_lock); return ret; } @@ -2742,7 +2742,7 @@ struct hid_device *hid_allocate_device(void) init_waitqueue_head(&hdev->debug_wait); INIT_LIST_HEAD(&hdev->debug_list); spin_lock_init(&hdev->debug_list_lock); - sema_init(&hdev->driver_lock, 1); + mutex_init(&hdev->driver_lock); sema_init(&hdev->driver_input_lock, 1); return hdev; diff --git a/include/linux/hid.h b/include/linux/hid.h index 5be325d..1add2b3 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -516,7 +516,7 @@ struct hid_device { /* device report descriptor */ struct hid_report_enum report_enum[HID_REPORT_TYPES]; struct work_struct led_work; /* delayed LED worker */ - struct semaphore driver_lock; /* protects the current driver, except during input */ + struct mutex driver_lock; /* protects the current driver, except during input */ struct semaphore driver_input_lock; /* protects the current driver */ struct device dev; /* device */ struct hid_driver *driver;