From patchwork Sun Jun 9 23:41:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 802843 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85C37179AE; Sun, 9 Jun 2024 23:41:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717976487; cv=none; b=ruRt3TiERI3yUWpQmNClXffkPYJiRZ1uXkJinbQ05IFK72+8gOnTaAaUdGO6Br8cjAHywm9Xr3U4vj8PKtVaUh+eZkKZ3J11nWmuxbhmHcXPX+npvDgmNZ7rIn6d/kri2//PHk8mV95QE0qLFkHCSgxQSRYGFohtPPtPzSPISac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717976487; c=relaxed/simple; bh=V4gvi9QbgIplDqrrmfrFHDBs7rFL44Z29wS0y+f08LQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=We6xe2taBFqrh/0enF7lbS6+SZmvnyimK5t76/8zEseeFmMMv4QcvWWcnNSBGWau1QQweGGqOkwyDwjl6E0KyakFXjZwG9SMiafF9advNl1NDcHGIbQkfXvgBnVQJxhIZX0FVDF2i8yb+KykPcn5EQdCLf506tDPpH2S17uCKAs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IAz5uo4a; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IAz5uo4a" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-704261a1f67so977850b3a.3; Sun, 09 Jun 2024 16:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717976485; x=1718581285; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iBDOkzz4pnRdAXapJDOO0B+7PQlNzo7SjqIZYQEkjvQ=; b=IAz5uo4aiUT/d43Hk8ozOJfHvZrU8eb+ntMSS5DNM4yYV/JLM8fg+pZ8UKZoNQqZ59 RPUoCkqXHdXgXSpcD3QudZDg+JOyjyGqGcpXuq1M1ZnC95MKK2jfWjUYKAFhCU73oo1r EuiYjVaQkisGjGoyZkTwA0ekzu3CGGEK1lhkzz4YosvshjzK2kNmGnymY5zY8N9gnVga EuytDONxsGO6qT6wZ5vbd8p/zmPCsSxFXkq6MHH86e+cKIWIiGZtQ5JCO/WEr5MW9OoP 8ZpYV1mXWaQEWtweckIEgfvFsHgf1qkfOZO3hsfJ4PotzUFE8Vk/WQJHTRXTbprM5eyE PMAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717976485; x=1718581285; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iBDOkzz4pnRdAXapJDOO0B+7PQlNzo7SjqIZYQEkjvQ=; b=eAyHhAHWbBkxxwJaHRt6jBmHn2QNGr8rKpitKgahwPd+hn8asEiYGHE/4WNe/JeAX2 bBaF/XV49cWcUUf+G1C+6G601q+PAavELEXHh+P7xUmH4BjUiM/h2EpwNvVJCIWtwl4c UmmirvKUtsW6PkWFvKgtqZV/LdWE/YNNy8COxq5MjzgBoL+8dBOO6mFKwrrdoyjjXiDU ZfNFzmozvAoGyyh+MIhUeom9jPWmDH5yaYc+r8zwIxAFUR0opuMR1XddCjZSxlu5O6Le ndoJSuG14wFfxfZnrHYGRbbHNia+vmasmcScgngaYJSsqtVZcJRzpJ14gaJ7fBaVoaiH K7Zg== X-Forwarded-Encrypted: i=1; AJvYcCXRMkm4Ynv+DJHfygCZW6eX2KFLKOmjaThuq2rDmJYJZkKb9DYExX/rwz/NhgQvYgDqxPVBxUvBLNrxrSahHUgkDS058RWx8Flj2sAh X-Gm-Message-State: AOJu0YwzQUql3Dgkrj/efdQnfG0UXvaOrTr/7IZ/EN68XUzHQ9xaQD8l jvACHpbeWkIMyNG0lBfshbU+QvVoypljxcxKQq/dM542eU/UgAuKSuETrA== X-Google-Smtp-Source: AGHT+IHZVmmd/ZGRcIZ8iMI6+RrPRA6YG5OR63N6XyYnN3Y/jG4fHZZOVUtjyYtVUnoQY4OMT2goUQ== X-Received: by 2002:a05:6a00:124b:b0:705:9748:7bb7 with SMTP id d2e1a72fcca58-70597487f60mr1381393b3a.22.1717976485479; Sun, 09 Jun 2024 16:41:25 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2620:15c:9d:2:55a9:13e9:dec7:f9d3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7041edb91cdsm3246877b3a.213.2024.06.09.16.41.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jun 2024 16:41:25 -0700 (PDT) From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: Michael Hennerich , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] Input: adxl34x - use device core to create driver-specific device attributes Date: Sun, 9 Jun 2024 16:41:18 -0700 Message-ID: <20240609234122.603796-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of creating driver-specific device attributes with sysfs_create_group() have device core do this by setting up dev_groups pointer in the driver structure. Signed-off-by: Dmitry Torokhov --- drivers/input/misc/adxl34x-i2c.c | 1 + drivers/input/misc/adxl34x-spi.c | 1 + drivers/input/misc/adxl34x.c | 15 +++++++-------- drivers/input/misc/adxl34x.h | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c index d4014e367c77..7531c7b2d657 100644 --- a/drivers/input/misc/adxl34x-i2c.c +++ b/drivers/input/misc/adxl34x-i2c.c @@ -132,6 +132,7 @@ MODULE_DEVICE_TABLE(of, adxl34x_of_id); static struct i2c_driver adxl34x_driver = { .driver = { .name = "adxl34x", + .dev_groups = adxl34x_groups, .pm = pm_sleep_ptr(&adxl34x_pm), .of_match_table = adxl34x_of_id, }, diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c index f1094a8ccdd5..2befcc4df0be 100644 --- a/drivers/input/misc/adxl34x-spi.c +++ b/drivers/input/misc/adxl34x-spi.c @@ -97,6 +97,7 @@ static void adxl34x_spi_remove(struct spi_device *spi) static struct spi_driver adxl34x_driver = { .driver = { .name = "adxl34x", + .dev_groups = adxl34x_groups, .pm = pm_sleep_ptr(&adxl34x_pm), }, .probe = adxl34x_spi_probe, diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c index a3f45e0ee0c7..fbe5a56c19d1 100644 --- a/drivers/input/misc/adxl34x.c +++ b/drivers/input/misc/adxl34x.c @@ -664,6 +664,12 @@ static const struct attribute_group adxl34x_attr_group = { .attrs = adxl34x_attributes, }; +const struct attribute_group *adxl34x_groups[] = { + &adxl34x_attr_group, + NULL +}; +EXPORT_SYMBOL_GPL(adxl34x_groups); + static int adxl34x_input_open(struct input_dev *input) { struct adxl34x *ac = input_get_drvdata(input); @@ -823,13 +829,9 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, goto err_free_mem; } - err = sysfs_create_group(&dev->kobj, &adxl34x_attr_group); - if (err) - goto err_free_irq; - err = input_register_device(input_dev); if (err) - goto err_remove_attr; + goto err_free_irq; AC_WRITE(ac, OFSX, pdata->x_axis_offset); ac->hwcal.x = pdata->x_axis_offset; @@ -889,8 +891,6 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, return ac; - err_remove_attr: - sysfs_remove_group(&dev->kobj, &adxl34x_attr_group); err_free_irq: free_irq(ac->irq, ac); err_free_mem: @@ -903,7 +903,6 @@ EXPORT_SYMBOL_GPL(adxl34x_probe); void adxl34x_remove(struct adxl34x *ac) { - sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group); free_irq(ac->irq, ac); input_unregister_device(ac->input); dev_dbg(ac->dev, "unregistered accelerometer\n"); diff --git a/drivers/input/misc/adxl34x.h b/drivers/input/misc/adxl34x.h index f9272a2e7a96..67e0ddc5c3eb 100644 --- a/drivers/input/misc/adxl34x.h +++ b/drivers/input/misc/adxl34x.h @@ -26,5 +26,6 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, void adxl34x_remove(struct adxl34x *ac); extern const struct dev_pm_ops adxl34x_pm; +extern const struct attribute_group *adxl34x_groups[]; #endif From patchwork Sun Jun 9 23:41:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 802842 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EB05588E; Sun, 9 Jun 2024 23:41:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717976491; cv=none; b=uNmIbvbVEMbQnL8dwZYseRxfx2CgbqPHRrX3NnecF5n8Gf6TTL+U7KkesvGQhNLLLJ5lBsta2oZRpxpFfXNvKO3yxKUZNedbzNyiezIxvVxNEiKuCHAmFKWB4UWH+8y3KGMOoGmaXrAUbkfovWzn/U2D7zTqHLtWC+VEDvqBng4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717976491; c=relaxed/simple; bh=v/w/WBCiVX1GwiN9yGDO5vWzVLYy+QdnC2/rGTBm5cA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r10i8oB9K48oydmmflJ3Ol1gJ1T6qybJ62gnJeUN06NAVhjVBqusc51gdtyAiMJUkxLdlvAfezpdBRtuwq5kmYzuIM4KkmyPsIucmPH7aLLkKVkFrxQitxYgsTcBiYIGmIwYA65w2AnqC7a+uvRnUQghQTdcuaC4bPyncujfERY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QGLn9Dnf; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QGLn9Dnf" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-705959a2dfbso274356b3a.1; Sun, 09 Jun 2024 16:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717976488; x=1718581288; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8x8SvJ+68zrI1ehRs/ceW/9Hyywh6f7X24DTYrjqAKs=; b=QGLn9DnfqbX51BoiTKuE+EIoYedNyi05Xe0LaQ3R1L447XW4Z1Cpu0Medc2MelajuN bS8zI7zg2w88d8hEdVcQpE9FimB3r6CoH/DH8fn2VcGv4N4///u/1taATDMtmVQOqrvk 54rKfwZ5f3j9eHB5OKR+2otV6QOp8idN/ejdeyB5KDx+NRFe2TFz8JPeVRzbfqK33Zsq tpSu59tj1uuitPh9WKqDdeXd7liXNIWKpTQS86kyrb8LU2vbgpPPKtDGZXh5a3KOdSrN KbpbGiIbb9dcdF/f4wwfjmjW1AR5yqP4mva/jj/2Oz/o+oeld2FFI/4k8uuapDiFEWLb G0NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717976488; x=1718581288; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8x8SvJ+68zrI1ehRs/ceW/9Hyywh6f7X24DTYrjqAKs=; b=uzi+ONnlDaTchrDP2Es2M0cyEK2CWlwaEcJ4GiTU1Np5KyEUvvu3bcVz94c0RIhAUC sbX5cEJba6TnEYu1q08Bz3kCXZcLRWN2NCI5ciCBrJC9F0gnwINloZldLjAxMKqWQm/k FdDFEqUqhK1DcM0xG7159i5nD19Mst73Z+wqPlAkN3ZosE56vC00HbEvXMi76BeD9FZb bNcvo7qrVaI7MxQyqbl2vCYlfMk5XEXRYjRBIDJsciUcN1ojIKNA2dePP16m297Ik2Qg SNjK30odbMl4nhHxOvicf4QB8BsAiPv1N1/RjEUwvT0erNX16/BbM7NLCCPndYY3uW56 DYug== X-Forwarded-Encrypted: i=1; AJvYcCXnBkViPZH4t0UGEF7+qRMi7XIoKHNFZ+AXkRGyWEmuDpZ+45WCNjoCPd0W60C98N2WrDvdwg66KEJwCBRkdtcQcwoOASQmfTb5X0zF X-Gm-Message-State: AOJu0YxDmhnKzgqKmmMUKXE852dm+1sUPU/4lxTOdzrbfJheGF+4/qaI eK4LeznuqXDr/32F/D7mWoVhk4wa83ZFzV+43BUOITtVk8f5CKSZrHx7wg== X-Google-Smtp-Source: AGHT+IF3znw/qHdl7pz/l2szH30/T+dy6rVIlLSbRmGEE5uJ9cMomqfaOLoIGFpwGLwVQwXLGO5LtA== X-Received: by 2002:a05:6a00:2e11:b0:705:9abf:a405 with SMTP id d2e1a72fcca58-7059abfa6a6mr697126b3a.9.1717976488315; Sun, 09 Jun 2024 16:41:28 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2620:15c:9d:2:55a9:13e9:dec7:f9d3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7041edb91cdsm3246877b3a.213.2024.06.09.16.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jun 2024 16:41:27 -0700 (PDT) From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: Michael Hennerich , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] Input: adxl34x- switch to using "guard" notation Date: Sun, 9 Jun 2024 16:41:20 -0700 Message-ID: <20240609234122.603796-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240609234122.603796-1-dmitry.torokhov@gmail.com> References: <20240609234122.603796-1-dmitry.torokhov@gmail.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Switch to using guard(mutex)() notation to acquire and automatically release mutexes. Signed-off-by: Dmitry Torokhov --- drivers/input/misc/adxl34x.c | 61 ++++++++++++------------------------ 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c index c6c34005f5d2..7cafbf8d5f1a 100644 --- a/drivers/input/misc/adxl34x.c +++ b/drivers/input/misc/adxl34x.c @@ -241,7 +241,8 @@ static void adxl34x_get_triple(struct adxl34x *ac, struct axis_triple *axis) ac->bops->read_block(ac->dev, DATAX0, DATAZ1 - DATAX0 + 1, buf); - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); + ac->saved.x = (s16) le16_to_cpu(buf[0]); axis->x = ac->saved.x; @@ -250,7 +251,6 @@ static void adxl34x_get_triple(struct adxl34x *ac, struct axis_triple *axis) ac->saved.z = (s16) le16_to_cpu(buf[2]); axis->z = ac->saved.z; - mutex_unlock(&ac->mutex); } static void adxl34x_service_ev_fifo(struct adxl34x *ac) @@ -416,15 +416,13 @@ static int adxl34x_suspend(struct device *dev) { struct adxl34x *ac = dev_get_drvdata(dev); - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); if (!ac->suspended && !ac->disabled && ac->opened) __adxl34x_disable(ac); ac->suspended = true; - mutex_unlock(&ac->mutex); - return 0; } @@ -432,15 +430,13 @@ static int adxl34x_resume(struct device *dev) { struct adxl34x *ac = dev_get_drvdata(dev); - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); if (ac->suspended && !ac->disabled && ac->opened) __adxl34x_enable(ac); ac->suspended = false; - mutex_unlock(&ac->mutex); - return 0; } @@ -464,7 +460,7 @@ static ssize_t adxl34x_disable_store(struct device *dev, if (error) return error; - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); if (!ac->suspended && ac->opened) { if (val) { @@ -478,8 +474,6 @@ static ssize_t adxl34x_disable_store(struct device *dev, ac->disabled = !!val; - mutex_unlock(&ac->mutex); - return count; } @@ -489,16 +483,13 @@ static ssize_t adxl34x_calibrate_show(struct device *dev, struct device_attribute *attr, char *buf) { struct adxl34x *ac = dev_get_drvdata(dev); - ssize_t count; - mutex_lock(&ac->mutex); - count = sprintf(buf, "%d,%d,%d\n", - ac->hwcal.x * 4 + ac->swcal.x, - ac->hwcal.y * 4 + ac->swcal.y, - ac->hwcal.z * 4 + ac->swcal.z); - mutex_unlock(&ac->mutex); + guard(mutex)(&ac->mutex); - return count; + return sprintf(buf, "%d,%d,%d\n", + ac->hwcal.x * 4 + ac->swcal.x, + ac->hwcal.y * 4 + ac->swcal.y, + ac->hwcal.z * 4 + ac->swcal.z); } static ssize_t adxl34x_calibrate_store(struct device *dev, @@ -512,7 +503,8 @@ static ssize_t adxl34x_calibrate_store(struct device *dev, * We use HW calibration and handle the remaining bits in SW. (4mg/LSB) */ - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); + ac->hwcal.x -= (ac->saved.x / 4); ac->swcal.x = ac->saved.x % 4; @@ -525,7 +517,6 @@ static ssize_t adxl34x_calibrate_store(struct device *dev, AC_WRITE(ac, OFSX, (s8) ac->hwcal.x); AC_WRITE(ac, OFSY, (s8) ac->hwcal.y); AC_WRITE(ac, OFSZ, (s8) ac->hwcal.z); - mutex_unlock(&ac->mutex); return count; } @@ -553,15 +544,13 @@ static ssize_t adxl34x_rate_store(struct device *dev, if (error) return error; - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); ac->pdata.data_rate = RATE(val); AC_WRITE(ac, BW_RATE, ac->pdata.data_rate | (ac->pdata.low_power_mode ? LOW_POWER : 0)); - mutex_unlock(&ac->mutex); - return count; } @@ -588,7 +577,7 @@ static ssize_t adxl34x_autosleep_store(struct device *dev, if (error) return error; - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); if (val) ac->pdata.power_mode |= (PCTL_AUTO_SLEEP | PCTL_LINK); @@ -598,8 +587,6 @@ static ssize_t adxl34x_autosleep_store(struct device *dev, if (!ac->disabled && !ac->suspended && ac->opened) AC_WRITE(ac, POWER_CTL, ac->pdata.power_mode | PCTL_MEASURE); - mutex_unlock(&ac->mutex); - return count; } @@ -610,14 +597,11 @@ static ssize_t adxl34x_position_show(struct device *dev, struct device_attribute *attr, char *buf) { struct adxl34x *ac = dev_get_drvdata(dev); - ssize_t count; - mutex_lock(&ac->mutex); - count = sprintf(buf, "(%d, %d, %d)\n", - ac->saved.x, ac->saved.y, ac->saved.z); - mutex_unlock(&ac->mutex); + guard(mutex)(&ac->mutex); - return count; + return sprintf(buf, "(%d, %d, %d)\n", + ac->saved.x, ac->saved.y, ac->saved.z); } static DEVICE_ATTR(position, S_IRUGO, adxl34x_position_show, NULL); @@ -638,9 +622,8 @@ static ssize_t adxl34x_write_store(struct device *dev, if (error) return error; - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); AC_WRITE(ac, val >> 8, val & 0xFF); - mutex_unlock(&ac->mutex); return count; } @@ -674,15 +657,13 @@ static int adxl34x_input_open(struct input_dev *input) { struct adxl34x *ac = input_get_drvdata(input); - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); if (!ac->suspended && !ac->disabled) __adxl34x_enable(ac); ac->opened = true; - mutex_unlock(&ac->mutex); - return 0; } @@ -690,14 +671,12 @@ static void adxl34x_input_close(struct input_dev *input) { struct adxl34x *ac = input_get_drvdata(input); - mutex_lock(&ac->mutex); + guard(mutex)(&ac->mutex); if (!ac->suspended && !ac->disabled) __adxl34x_disable(ac); ac->opened = false; - - mutex_unlock(&ac->mutex); } struct adxl34x *adxl34x_probe(struct device *dev, int irq,