From patchwork Wed Apr 23 08:55:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 883652 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 638691EFFB2 for ; Wed, 23 Apr 2025 08:55:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745398552; cv=none; b=BT3Mm61Sb79ZN4XcBE3WqZNWRT6KeyN+sqrZyG+IynqsEQcZ1BcfdxqccuyIPmHPoHSEHULvQHVcsLk5H5mRPKY+AIM/+WsRyuhalONlqhKDTVZzhQaTo/sSlUQzTqzN3IECtnNl8JxUaIgMSTqTEW3tsbwc1ARkD9fCTo3Ap/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745398552; c=relaxed/simple; bh=oSqHYPefJTh0bLFCxZFI8OnstoUZFH7q/TAZpQkyL5w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nlFCZ99E+zGXYLRbi4wU/3K6Y5RiAAi9qY2Fe6/5ic4aMU+0vanwk3vMFbIov8uy5ZxLvmQAdH7tJec6vOJEspN/l9m+h/+yGUD99D0SqMMOevKu3owbuIyJb7xDXHrvc9qxRj/9lcSB8eE+vhJCqJZ/fOThqisln/cRJ7NS04E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=qZZzQQbv; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="qZZzQQbv" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43cfe63c592so69602335e9.2 for ; Wed, 23 Apr 2025 01:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1745398549; x=1746003349; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=TLH1JzvSTREU0y50Cn9mOsy4ychR1nU69CWKH2jYQrU=; b=qZZzQQbvH9DE2piWzb/ms1wcmd6v13mbyQbUhqxkj9wuvGNBI48Dw9XhbVTCNCfyor ug2kSvPxN847qVGnGyaXscavNuy8fBT5/EZUrh8KNaDJb8hkevfQTnHgwTDYe2i97bzJ scj1j3A9BvQShn5JoD8oYe1LADpZurK1aOia4Z7KjCPbyy1T3X9w0aB+L6cjLYYc00vU b7WoUOlYfissbXb+3l+PwjvBAitTmEFDzF1bwxz480gSLy1myhYzkmd4FwUwVloPWBEg kw3Q09cDANy1ZTP4Xd9uFOfxc0GDDlmm8B1UVn6FuYRLjEPhjPuXmUV05kPGEX8KG284 8b5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745398549; x=1746003349; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TLH1JzvSTREU0y50Cn9mOsy4ychR1nU69CWKH2jYQrU=; b=GUZHUS8HRdVYbWiiy15b+L7UWhhAhVANLA7T+Wgf5g7zduKBp8D8MK/JvcnA6UHGor fqLedxCQde7KNDvMrDQZ/PYNfCdPL2Rd8hFNeCShmI/fgCzEulAq72SVmYmWcH5li4cd AMAhGhLY/1DZz+S7/K2BorAyZbNyZFkqWYcGE9zv56wWW9Gz0VskzGSuoIjoA8bYEmnv jFYPv0bQQvV+Z4DFrkDT4H2ZlMMFZy8hmmWTF+ysq8O73AvMYPOg+EjqhbJVWxmwaD22 V0M60pA9Syz6uYEz2Plm83wBK3EJ5GqdUb0WpUElWJJhr3UBdg0BRQVmh+uyVQiHm/0n VqYA== X-Gm-Message-State: AOJu0Yz3ogTSB0nklr7iuRnqCGnFKYpeE5qrSlaxoPDujb7iSGhXlJBm gVpadhjvG9p66to64YUZjVyU7/mg4Vkx3qS65bUK0U9tES7IIHIUAcWStBZKBReNJKw7UHjOVfG un9Y= X-Gm-Gg: ASbGnctruOuAbT13br+nmmf5f36ykcII0g4ofTHUaAKG3tnOK2WZfwh4GN68lbc+eIw 1RL7crGvHdFyHjJNj034UpFw4PtgPA2A4AIki5XxhNLP7GfzVEHYIoqOvadmfO5u0YA7lSCWkSz TAXQDiibWYIJucJcUMo+6oDgpnEyANDSTjfKILmM3Aisf/mPKPDhGjNB6reM6dItL6+3Az+6Hu9 r3YP7o2hGL+S6xEC30WKHcuBXsEsA9z3AcoEgcwb/gFMr6BcnIgVNaZIdtngLF1/MaJKRiRl0Sq Ss3i02wlV7eXewmqvHKLbe6cI+pZrfDwXg== X-Google-Smtp-Source: AGHT+IH8W/feylzZF2EABZ3eDPTmlhzOnWG2w8VOJAxIzHJN0weLObZAJJfvcrFUvwlJ8eUSbPfqkg== X-Received: by 2002:a05:600c:4e16:b0:43c:fa0e:471a with SMTP id 5b1f17b1804b1-4406ab67e6fmr156643165e9.5.1745398548675; Wed, 23 Apr 2025 01:55:48 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:74b0:71bd:6dda:dcc1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-44092d3654dsm17731685e9.28.2025.04.23.01.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 01:55:48 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 23 Apr 2025 10:55:39 +0200 Subject: [PATCH 1/6] hid: cp2112: destroy mutex on driver detach Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250423-gpiochip-set-rv-hid-v1-1-2e6762b582f6@linaro.org> References: <20250423-gpiochip-set-rv-hid-v1-0-2e6762b582f6@linaro.org> In-Reply-To: <20250423-gpiochip-set-rv-hid-v1-0-2e6762b582f6@linaro.org> To: Jiri Kosina , Benjamin Tissoires , Linus Walleij , Bartosz Golaszewski , Rishi Gupta Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1030; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=Klkz4iiObkBAesFhi0HB9u9IdBbnHegphVVUCmw+Oqs=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoCKsRD2kA3kI6m5k7SF2QDveYPM6LDKcaZSt/k Z0NCj7PN3yJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaAirEQAKCRARpy6gFHHX csdBD/9dlawSVU79eVpqYmkVBPVCu7CJdNudzdR7AhtPo7+7ib8nN/WUj+5btoGFgD1zXgAjykc LnSBlPzImUk/2kr81kNbcRTGqQzD9ixUfAfOR6zCLWuyAout9cxOaJy7J62bysIrOGK81SCvcLw VLay9I4A4muuJOn1n46WIFXPBhD9n/31FpPQVlKwFVV+NjytYA6toDLfhG69iKQax0cviPfuvXJ DzzeOdQpZyiU1TEumfCqdq5F8O8nVOPv3y9Ggfjkvvv73F4rQb6Ib+NbJnXoLBUlM1/tkC21nu1 FHMvHkirhRcaJBHKJ0o+afxYfpaqDQzZ1mCTjso7qyREzh9V+TFlcuDN/8NPqtgnsDPUlFJfXn1 vFyF4uYvVDfTlCDryXGjgqzE/iuoIS7WTHXBaAnJEuMk4v3WT2FoSERFt2aePQtgTe1gtcwnKFA NrwjqKJIJvNjnPWTvxtcRLxDy8wfcqs5F6fHHEKeyRdcSdNxuhWaFZ2mJkpIYAdEtuLwwHH+RI8 axl5OJ5hBfwJraP58lPtJVxG5rpMXMiHBbhARaVqpR+Qo62ozgjSDI+Ne1vEAlfJFZ/Wb26zlcv oRic6rvN5xIdGVW54vE5xHOeovhxTe2CkWIE8t1/ETnLh9b4Qvgfh4loopwmBdVssiKMzga5XRh aq1RaoH1l023BKg== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Use the devres variant of mutex_init() in order to free resources allocated with mutex debugging enabled. Signed-off-by: Bartosz Golaszewski --- drivers/hid/hid-cp2112.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index f4c8d981aa0a..a001b9acd2d4 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -1205,7 +1206,11 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) if (!dev->in_out_buffer) return -ENOMEM; - mutex_init(&dev->lock); + ret = devm_mutex_init(&hdev->dev, &dev->lock); + if (ret) { + hid_err(hdev, "mutex init failed\n"); + return ret; + } ret = hid_parse(hdev); if (ret) { From patchwork Wed Apr 23 08:55:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 883651 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 C126B1F2B99 for ; Wed, 23 Apr 2025 08:55:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745398554; cv=none; b=DFiJUuNMNACgUd0KWoECZBjY8QCq9+rOw33ssoHfMcwsXY4mY5gUaKFmO8w46kzwQaZyOTwGEr9+ivvVp0gEsTVoltowYGP9flKXBQfZ5bpelXSzlO9aWeiYLD8++kCrgAxyuiWWQ6UuYKLSOaXHQ1joqNtQZuD8e5THcjKCAVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745398554; c=relaxed/simple; bh=ZKUX3nw4FZjC+N4ScPc3tAK+DbEUS/qVAgsD0lmzRTs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L8Mszmlm9vpZ0tTL10Ysg+jFq22+vZU9SCPf3eya92D8kH9ezC3T0L0G5Hg1e00eadZwuY7mIrIuCbZfuj3f8rx62N1SUoYNP4q6wSpYw2F04YuFLK1AUspUdrktlWelaonf7skBGqRhgvBH0pN0D3M1K0LJ+IVmtiCNg26jYUE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=dv1FAvLg; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="dv1FAvLg" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-39141ffa9fcso3558553f8f.0 for ; Wed, 23 Apr 2025 01:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1745398551; x=1746003351; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=CRQAzpylpQHW7wjn2Yy3ejHzxEGc6mOpxfcsgicq3lM=; b=dv1FAvLgh64bifJihDkavG07VIWBZztaKHR9k0KD43kwz9NsRLgB0BnkMd/1EZ6+r8 9Z19Jaa3Sgne1LRofVtRCfdDTmp7JzQgHETqZGQuA1DxVq+sv0uA9GxX3dBVoftK5LmX tIBSAd8f6AAW6ax6FFDZAddF+6ZTaDcfKYk5iOyZvyO8yPrHfXFqYk9YZlkewJvxRt8z 1WskaHeL/ndJFwU+oaYozajb2G/ijcaQs1yczVvcAQsidB8xA4/y3SHC+9NKkp/Glv/E sADTWIeApObbedvid+iWPFc0C6ZvbbX7URc8fV8p8On4j3wb4YkvO5J71aY8pJz+ewwL bPUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745398551; x=1746003351; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CRQAzpylpQHW7wjn2Yy3ejHzxEGc6mOpxfcsgicq3lM=; b=aieywHbUXlq7EclL8jhqU38+ITPjTJCz2MWbyr/MVCNYIpiPFeg1WHF0nw3SezP4im brF6Vu7wEJyvqwLT3fiXkhuQ5z1Vf5Li5uIaX/EiRHEoyzh5qj4R2hnM6Rmp6oYnUxzK qFz9QwODcRDjnKLPpLWNeORJy/AHRTSk3RYT5vonvR+ovh6D59nYcyZ62qcgA5a1G4Gk JnktJ/oZnRCs9xTuJIxRDAOU1Ex5f2k1lsKVn4GKd3DGuM4K+rxqQ3/jjGeFlehmrYW4 0gpxzcU9H3xTCLsUHDCtF+NPprwJ9vWBanjIpgb9NNuSkYsfSWJIDCHjcQ4Wu/HHvi5i /isw== X-Gm-Message-State: AOJu0YymMF/rOguBZy3Y0l8+1BfBRvegklfaPWbQoe3eESE5fbOqy95u I2/wseqAE0zk/AFTr3LSpVf8NeLuMsgJsw2E2x60sWzcCRUOI/VPgOhgX9g5SaI= X-Gm-Gg: ASbGnct2IfNaqSaBjfyRo2RxC2K6o/u27FSZtKY5MWmC7Jev9V2TOAD0HOvloLrnN4k MTggryd36iu/xAZwlnMzWiHOxCmiJX2mWHFkAjf4qBwYhocZ9DU9NYnSJlUF2ZHokQyBicoDJf+ cmzfqplMNPXjKLIQPTFg5gdnWwagK68uaI0mLbhs/tm6cFtD/ZqfupexAk4sFhcYNrsofQKi1Xt 63JRByt2ZegZi+vGFsGVgCDewkhbwK/2RDbt6uLI+8IwF668VzVoFN7+VVDVJVRnJPCn+wmyil8 xSHT3leG5fd3kyubAdhra8BpmXy4go/uQg== X-Google-Smtp-Source: AGHT+IGoalfCd15VUlEeIzWF5CGPrSIg5URCnSt8BcRGLzzqD0ZxgfBLXu3CW9QMof7F6AmBeY3yKA== X-Received: by 2002:a05:6000:402b:b0:39c:30c9:815 with SMTP id ffacd0b85a97d-39efba3ce3fmr15132392f8f.21.1745398551044; Wed, 23 Apr 2025 01:55:51 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:74b0:71bd:6dda:dcc1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-44092d3654dsm17731685e9.28.2025.04.23.01.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 01:55:50 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 23 Apr 2025 10:55:41 +0200 Subject: [PATCH 3/6] hid: cp2112: use lock guards Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250423-gpiochip-set-rv-hid-v1-3-2e6762b582f6@linaro.org> References: <20250423-gpiochip-set-rv-hid-v1-0-2e6762b582f6@linaro.org> In-Reply-To: <20250423-gpiochip-set-rv-hid-v1-0-2e6762b582f6@linaro.org> To: Jiri Kosina , Benjamin Tissoires , Linus Walleij , Bartosz Golaszewski , Rishi Gupta Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3540; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=svsbVswSqZ1RUCT08RBk/vS5nyg6Pd3lS1RPThjb7W0=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoCKsR/N6zMcg8Ye3ytrtXSvWWOiIfYJxg3rywi bYzY8OzIAmJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaAirEQAKCRARpy6gFHHX clA7EACHfVIi2x1uS7Sngv3quCHbq8sy/bhDCfJkvn5O2G9DSvTAsQWYPME8KVA+XFAUmoliGdH FQid4I21DsUd4ML9rZW9yCsSu6hHsvB6d+IBLfqA0qRK60DnmGEuOngBHvVpTL6cB8pbKLrWyG3 Dnkzm4zDPOYbujo7/Eu07KKj3ljHFbWv4qaZFLFb/nqTvCVV1ThvClRN/GDd3nFTs8qKseyI8db QRK8GojnAa4XDThabDJWSHnUMXqHldZJ+jzM0HklJwtL0f57KUoxtmlhSzLKRd73zq9LfYf6648 THljU/jjKvb+QrKT9dWK9mbxqquTasNMDoKnrrpbZ2cutMllgxUCOvaXPfAupyo+McYi5L+4qL3 PAFOpy7RGn8LQgRby5YR8uXRVTl9r693dJgF0w0XowEtoOn3p81aLegOY1pmtgskv3Jg6+22Hle w1wiYqup+vXF+WhVbghNI1tFIqA7OLqiY/UD8SVpfUpGMJidHURMIDDmnuwKRWxKKv1mn+B6r+B tfrlDto/G9Ha4x8Kw2Uk0ZDjdenPGTDYrF0XE6KLuEyKwnxrjRKE0Ey4Skwdk0B0iRUO2Co7ot0 oMWZLYwjZowvcIPxF/HpUL9uh7bEXMmezh38sRzrbu716LflsPRnZHsL/kJUF9Zm2VY6XmI7kG3 GviItMic5e6OG5A== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Simplify the code by using the lock guards from linux/cleanup.h throughout the driver. Signed-off-by: Bartosz Golaszewski --- drivers/hid/hid-cp2112.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 408c865efdd4..92dd891b7b59 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -187,7 +187,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) u8 *buf = dev->in_out_buffer; int ret; - mutex_lock(&dev->lock); + guard(mutex)(&dev->lock); ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT, @@ -196,7 +196,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) hid_err(hdev, "error requesting GPIO config: %d\n", ret); if (ret >= 0) ret = -EIO; - goto exit; + return ret; } buf[1] &= ~BIT(offset); @@ -209,14 +209,10 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) hid_err(hdev, "error setting GPIO config: %d\n", ret); if (ret >= 0) ret = -EIO; - goto exit; + return ret; } - ret = 0; - -exit: - mutex_unlock(&dev->lock); - return ret; + return 0; } static void cp2112_gpio_set_unlocked(struct cp2112_device *dev, @@ -244,7 +240,7 @@ static void cp2112_gpio_set(struct gpio_chip *chip, unsigned int offset, guard(mutex)(&dev->lock); - return cp2112_gpio_set_unlocked(dev, offset, value); + cp2112_gpio_set_unlocked(dev, offset, value); } static int cp2112_gpio_get_all(struct gpio_chip *chip) @@ -254,23 +250,17 @@ static int cp2112_gpio_get_all(struct gpio_chip *chip) u8 *buf = dev->in_out_buffer; int ret; - mutex_lock(&dev->lock); + guard(mutex)(&dev->lock); ret = hid_hw_raw_request(hdev, CP2112_GPIO_GET, buf, CP2112_GPIO_GET_LENGTH, HID_FEATURE_REPORT, HID_REQ_GET_REPORT); if (ret != CP2112_GPIO_GET_LENGTH) { hid_err(hdev, "error requesting GPIO values: %d\n", ret); - ret = ret < 0 ? ret : -EIO; - goto exit; + return ret < 0 ? ret : -EIO; } - ret = buf[1]; - -exit: - mutex_unlock(&dev->lock); - - return ret; + return buf[1]; } static int cp2112_gpio_get(struct gpio_chip *chip, unsigned int offset) @@ -292,14 +282,14 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip, u8 *buf = dev->in_out_buffer; int ret; - mutex_lock(&dev->lock); + guard(mutex)(&dev->lock); ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT, HID_REQ_GET_REPORT); if (ret != CP2112_GPIO_CONFIG_LENGTH) { hid_err(hdev, "error requesting GPIO config: %d\n", ret); - goto fail; + return ret < 0 ? ret : -EIO; } buf[1] |= 1 << offset; @@ -310,7 +300,7 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip, HID_REQ_SET_REPORT); if (ret < 0) { hid_err(hdev, "error setting GPIO config: %d\n", ret); - goto fail; + return ret; } /* @@ -319,13 +309,7 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip, */ cp2112_gpio_set_unlocked(dev, offset, value); - mutex_unlock(&dev->lock); - return 0; - -fail: - mutex_unlock(&dev->lock); - return ret < 0 ? ret : -EIO; } static int cp2112_hid_get(struct hid_device *hdev, unsigned char report_number, From patchwork Wed Apr 23 08:55:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 883650 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 A780A223DEF for ; Wed, 23 Apr 2025 08:55:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745398556; cv=none; b=gfwrxiqAVGFEvdY1zgXD+9pM855wHP3kyv+a5UIUtieccARCwR9/daEVEQ4g/eoaKPBzHeUVx3tOsx1kwx+PlNSeD8z1QMfo5R09liRr+cMEGHjWXPdsI8680zglydDwUsPMxDfsMkQ5rCJIfz7uo1Fh3OU4kKVaigkYkgcps5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745398556; c=relaxed/simple; bh=IpkDgplwnpCnmf4TZWsszBJ6O9YeA9J/UngYhMFFKwI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dm+gmO0ieT7C7UAgZ9WBVKc50v/Rosx8BzZqkIm2rxcgFKQGiH6o5gmE6doxvLLA7Rh1W+6GSrWzZYq3mMwAH7j4Kn3P0Vm9vJ/1rDXKvHtdT8Yo7HAxAIn+m0wteUUMe5jBSXGbqK/eJ919rIzGaIRkmN8jocWQ+1s5VQ7oAg8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=qcSGcrQM; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="qcSGcrQM" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43d0359b1fcso4730215e9.0 for ; Wed, 23 Apr 2025 01:55:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1745398553; x=1746003353; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xujYyKOLUtbIFtoGOYN4dvZkp51sWP9BMyF/9rfhfB0=; b=qcSGcrQMh18Mx4145cYMqd/1snbM1UEDoTxljRxypOApiN6oRkkYR8EKt3Fg6R5pQi x700h6xa9MqJEzajCr5sRD/Lg909wr6kJrcZU96P2LCdC9beWjVu6hOFlOifoFEGn1uf /kVR6p0U5RXenA8B3Ve/w8/Sk/MYRloYBGP/vJMxApaL+QunNX9/4DvX3LFDhlahCdZC /jvsbcYi1owsOYAImEaieReHWqFNiwd1K2x0HPUHFyHRCkoayEd2bvxOTG4PCw6uULvD 6tavErs+ziV3IjYHQV1zWs8sFss8hBw5lTyAF9uloKsO+JQE/Vk4R+Uc0+0tC+we01AK FL7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745398553; x=1746003353; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xujYyKOLUtbIFtoGOYN4dvZkp51sWP9BMyF/9rfhfB0=; b=IPtwr7UXK2+W+peyJvPwPSe/lMoeyj836gfUCjIb9A7+YrpFoUTlzaF6eGfv1Ohzkr 4CcYGbtmvsrKOIwyxDb9lPm4EWYvMk6bu8f/3ydz5y+5bqdv4IPT9fH27dafX1CySC64 krOlUEso6dPF1WRACJdX4LNnQmFhrhFCVRYAoSyeQOgVsasS5yd/+jII6wAhXQVBgk+7 UHflWx9wFClncIp+kXb3oujPl0/zPLAAQejoMNI+8/4NsOksRkDFmQ7saKkSmVAKnkUt ykj6wiDYaVsYdWmpoxJKNJPOgg6wlFeHZXrBLZQPzY/3m2mUpFuSnTjPI8BPGWERBjHs PrRQ== X-Gm-Message-State: AOJu0Ywr1jV5P6M/AUgl3iuj1YHHwxNebeTJpRCCyUqJQWPXSp2yjWs3 HwZ4NAx2mtnatxqszU1TNix/uiW+dL+EEKmPcwvmuivFOJcFFIlRn4fvfkKZS2Q= X-Gm-Gg: ASbGnctqA245hnm5MFevf6sHCD/JDD+Bja99HGn9OqOkEIsjab/vvxVUTJMTryozFhT 6oJ7MqPT5Qfdc/31qMCBmSOKr1b5wyKMClsatnoJuMHdxx0hD2ht5jytb//SMmP53/1cPexYY0U ipIN6NYiOtujRopM2D9cvx39XI14FFKP6JpqLhul6GfvhxhRhh+lL++l4KTfbe97XzxceNnfHWe m2xDbPDU3RuQ1xkVNRgJJG8hxqEHFxwGrBzHZTEZtyc6nzWI8KaRzTdyb6Pf8IGSdczAyAI1E4q J18QCrMo2Nk9Ttt1pcnr+HlBJPEskBy5Mu8SnYRkc0my X-Google-Smtp-Source: AGHT+IH5O0o2mxC9oUy2yMKuDfMRopZF/pet7Y3HVnOv2ue1C+p/vz/hM7WvcmmLgF5cF1LDMRJLzA== X-Received: by 2002:a05:600c:3b23:b0:43d:186d:a4bf with SMTP id 5b1f17b1804b1-44091d2e039mr12818225e9.0.1745398552941; Wed, 23 Apr 2025 01:55:52 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:74b0:71bd:6dda:dcc1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-44092d3654dsm17731685e9.28.2025.04.23.01.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 01:55:52 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 23 Apr 2025 10:55:43 +0200 Subject: [PATCH 5/6] hid: mcp2200: use new line value setter callbacks Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250423-gpiochip-set-rv-hid-v1-5-2e6762b582f6@linaro.org> References: <20250423-gpiochip-set-rv-hid-v1-0-2e6762b582f6@linaro.org> In-Reply-To: <20250423-gpiochip-set-rv-hid-v1-0-2e6762b582f6@linaro.org> To: Jiri Kosina , Benjamin Tissoires , Linus Walleij , Bartosz Golaszewski , Rishi Gupta Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2393; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=Xe8t0cpiuXJK24uNCrjJrCuXqwBBlo0SGHtnD96+ABQ=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoCKsS6nROAKUfKKPoUE9uts+jWoWMp4vrsAXyn W4jFsTpftGJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaAirEgAKCRARpy6gFHHX ckaeEACGpatmiJ9qt1T6hsGmMRqs2sFqWxlzRfU+OQx9iR4FdQC32TPbMOtJJRAuxCFMk0H7+0E AhxxwbdSJ0NlDOwGDXWV5Q3hESoDwQT1O2BkWq+X2PS7ZTL2DPQlvrMAswo0ELOahpCI82k29Ck KhfhUftY2CaInq2Gq+fBlQjltAFKAx5otmFMoBQTJs7bMKfJrhXUn4okq3/UuSlgxKM4GLsh8vD f+GXt37rNtuKUh/lQajSBsFAZbDMRGFM7LKZITTB0UvNsD2A5vpi79R/Qnxcoq0gEHALMFzE3nv NqSOsTDaD9aEM5V0aEvXTntCgXf8vr72Qskq9HlxFwwbzHTSMFTy1RyksLsbzEeTs4Kq5+Hrtkr sW+kSabg60nzvxTccwAg285BW60P0x7A6XTja0lWLx9nLf6vPVqlgyAy9wXwtc56qPIMTzLvPtv Eua936FnGDq6DY9/JAkTkYbNXRMZuI0p1/oMVOxdyzM2qtRxRJy7qARGA7PA9FsCbJ/fyp2wUii fwCIzA9KQ1RsdXHom4hBMTvA/CxSb5SEMss3nrfP9XvjNLpoz+j6oxYYY/bQMV7bFiNH2LOeJwW xuE63LhVXASlR8thZZyawKE+qcA29IyschYh7EW3aE2V06r1M5vqggDuMBN+XYTujbNE80JNDNR awhhR5u+RCPd83Q== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski struct gpio_chip now has callbacks for setting line values that return an integer, allowing to indicate failures. Convert the driver to using them. Signed-off-by: Bartosz Golaszewski --- drivers/hid/hid-mcp2200.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/hid/hid-mcp2200.c b/drivers/hid/hid-mcp2200.c index bf57f7f6caa0..e6ea0a2140eb 100644 --- a/drivers/hid/hid-mcp2200.c +++ b/drivers/hid/hid-mcp2200.c @@ -127,8 +127,8 @@ static int mcp_cmd_read_all(struct mcp2200 *mcp) return mcp->status; } -static void mcp_set_multiple(struct gpio_chip *gc, unsigned long *mask, - unsigned long *bits) +static int mcp_set_multiple(struct gpio_chip *gc, unsigned long *mask, + unsigned long *bits) { struct mcp2200 *mcp = gpiochip_get_data(gc); u8 value; @@ -150,16 +150,20 @@ static void mcp_set_multiple(struct gpio_chip *gc, unsigned long *mask, if (status == sizeof(struct mcp_set_clear_outputs)) mcp->gpio_val = value; + else + status = -EIO; mutex_unlock(&mcp->lock); + + return status; } -static void mcp_set(struct gpio_chip *gc, unsigned int gpio_nr, int value) +static int mcp_set(struct gpio_chip *gc, unsigned int gpio_nr, int value) { unsigned long mask = 1 << gpio_nr; unsigned long bmap_value = value << gpio_nr; - mcp_set_multiple(gc, &mask, &bmap_value); + return mcp_set_multiple(gc, &mask, &bmap_value); } static int mcp_get_multiple(struct gpio_chip *gc, unsigned long *mask, @@ -263,9 +267,10 @@ static int mcp_direction_output(struct gpio_chip *gc, unsigned int gpio_nr, bmap_value = value << gpio_nr; ret = mcp_set_direction(gc, gpio_nr, MCP2200_DIR_OUT); - if (!ret) - mcp_set_multiple(gc, &mask, &bmap_value); - return ret; + if (ret) + return ret; + + return mcp_set_multiple(gc, &mask, &bmap_value); } static const struct gpio_chip template_chip = { @@ -274,8 +279,8 @@ static const struct gpio_chip template_chip = { .get_direction = mcp_get_direction, .direction_input = mcp_direction_input, .direction_output = mcp_direction_output, - .set = mcp_set, - .set_multiple = mcp_set_multiple, + .set_rv = mcp_set, + .set_multiple_rv = mcp_set_multiple, .get = mcp_get, .get_multiple = mcp_get_multiple, .base = -1,