From nobody Mon Apr 6 09:12:05 2026 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 795A02773D8 for ; Fri, 20 Mar 2026 03:54:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773978901; cv=none; b=hNLcsMpggHbG8xc4TQRReAxN4oQ4uRpL0ZQDeFnh5NX5TYcG5S2C82r/m/RE93ez/g6OOVIsaffHdAnmzTlax8LiqccLMjEcdBaJxNR3oFTExNrB8JwRcBZeKHeYXASDwUI4tVB8fttC+fkh2AJ1WO577KMy7CJwccyr6tgqraE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773978901; c=relaxed/simple; bh=81BNlKOq7HXsOqhkN/MlVRcuihbkxdhNzCRuIrb0v34=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=NzmgsFECKBN7kcwikYXomQ3LNeifC3lx1pVa5mq1vfU6bWHtH4nBqi2mLRQ6W9DY0WEeLJFYKu3Vyf77NMq6XwdAzwZJO0H6nW4q6OG9Rf+vSsePT281srxM3lGb6isXIC3es76Ge5xCwbAMOg1BKiWv/v506RrD9uhYinL0www= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=fA2LG8xa; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="fA2LG8xa" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-486507134e4so18891965e9.0 for ; Thu, 19 Mar 2026 20:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1773978898; x=1774583698; darn=vger.kernel.org; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=FZPeaElYrVk/ldeIQ29YBPboU4/yGlx0Qb+/RBeWqLs=; b=fA2LG8xamLvU8UQrd4mqzISmLDpr5IGKHjsMxWu00t04h3AkVuTwk3R7AWnlTeGm2H +3gVpWWjZzV4Ydra9q5yvDvclWOtInu1mS6aCtDmiy7nLRa3bzk67ns1DdVM+EabQsK6 I/smW3a20tRQzjhUaXati1/M4UmSIBNM154FFk6i94n/SxSfo8Q4nSWwTPzFZxxd+1Le lC5XmByBzobPfs+6bRWXH/NNT4e0iu+yiTjCoc5OJ1rkE4ArutFs0xmp4e/hqdCBJ3qS /5xriXBUGxJMWoFqRWyxT1+ol/pmvzBKBvqmKMRX+1xWrF2Kj+Fyb9WN9N0uvgzdIDiV RHIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773978898; x=1774583698; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FZPeaElYrVk/ldeIQ29YBPboU4/yGlx0Qb+/RBeWqLs=; b=j4rPs7k+mxMr01iwtt/1OdtyW0dmfgGfCE8g0mCaXxinZZ3Gj57dE/YaiBS19p5Ukk /qlQTx8YvjjB1DSyHhRIOfIuXkRWE2KN4DsvILjsBCDzxqEEBHAlqbGgyrSg/NxmBBHB L2PPDDjB7Li8k7ClcAmw96npwaNhC8Q84olRwRWL9rhfs/iJatfXTcYhviItH1lYq5Vl fOymyzUH+Ig7kJQRuHsOYdwywKo+73h0Dmv4V4w3U1wBu8WASx1lYmR/ZSLTqPyl1t4T 0D2rqEvPYvy6JS9g2B/qtGRE/pN0FllIcbO/akiU6PFKt9G1gBk18APEx+WEw+If1EKC ZlIA== X-Forwarded-Encrypted: i=1; AJvYcCWC7/8AVNrtr7f6NXc0yifxXZc0oT3bWFLLyHg1ABQNjNToDtix1tcIfVrMgtchBMEGcAVwoJy7eZpZf5s=@vger.kernel.org X-Gm-Message-State: AOJu0YxUtjmQ/2eAvYcqjx/t3xDksOwl0bnaMfgYFfXr3WyOTRSl36mO v5bQozs02HMHXqeXXMkhFnhp8eIbuPtVLUYySP4aAhPmg1eRiiQMDT54okyTpexhZ4E= X-Gm-Gg: ATEYQzyeJp9LiVHuSjPTkbCNdTyRWC1mKPXsRXWNpUW8cdbR1T/ssbQxF6GhkIVEkpw s07taDW/yC4yy+/0rlzR0JNGfTt1ObQN+e974ET6X1LeVCZl9dgPSTbpIdhEocWoghn7N1U92+A sG+Wn9M6nukTI9rt9fTHnmFG5OE5mwUtDkeLRlBPxWMANZwZiwNyJaexhPEvSaHWWyZeY+0/3gW tspRbZaHMk77JOyqooCXCZatKtx0cBvAGw9VA+fwuNGjpOP8C19Zw+gbL55+rBTLC2pKWoWpQ5i P3ZZvhX+1nPLc4igaovSGtI0sA/Lvqziey2rsn/QnLOOBarShxEetTD8WI7uZ4fMtP/wmbHkrxV Z19aKOPV0rxev50VCXc4X8XqjvaE36BFxwBBNMmsIuaR7y1xWfMfgfj+XR0bIiKIEa58gjkeLXo T6m4i3+eP7YTMFza5Bb5JQKvMVYUM7IqdjOo+9uBWSzv04TGszrA== X-Received: by 2002:a05:600c:8b61:b0:482:eec4:76d with SMTP id 5b1f17b1804b1-486fee12d23mr19037215e9.17.1773978897653; Thu, 19 Mar 2026 20:54:57 -0700 (PDT) Received: from r1chard (1-164-68-48.dynamic-ip.hinet.net. [1.164.68.48]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b0836a3370sm7236965ad.78.2026.03.19.20.54.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 20:54:56 -0700 (PDT) Date: Fri, 20 Mar 2026 11:54:52 +0800 From: Richard Lyu To: Lee Jones Cc: Pavel Machek , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Lyu Subject: [PATCH v2] leds: lm3642: use guard to simplify locking Message-ID: <20260320035451.31071-1-richard.lyu@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email 2.51.0 User-Agent: Mutt/2.2.13 (2024-03-09) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The mutex_lock()/mutex_unlock() pattern requires explicitly pairing lock and unlock calls. Use guard(mutex) instead so the lock is automatically released when the scope exits. Convert to guard(mutex) in lm3642_torch_brightness_set(), lm3642_strobe_brightness_set(), and lm3642_indicator_brightness_set(). Add #include to support scoped guards. Signed-off-by: Richard Lyu --- v2: - Sort includes alphabetically as requested by Lee Jones. - Rebase this patch on top. - Link: https://lore.kernel.org/all/20260319151539.GO554736@google.com/ --- drivers/leds/leds-lm3642.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c index 61629d5d6703..36246267b096 100644 --- a/drivers/leds/leds-lm3642.c +++ b/drivers/leds/leds-lm3642.c @@ -3,15 +3,16 @@ * Simple driver for Texas Instruments LM3642 LED Flash driver chip * Copyright (C) 2012 Texas Instruments */ -#include +#include #include +#include #include #include -#include +#include +#include #include -#include #include -#include +#include =20 #define REG_FILT_TIME (0x0) #define REG_IVFM_MODE (0x1) @@ -202,10 +203,9 @@ static int lm3642_torch_brightness_set(struct led_clas= sdev *cdev, container_of(cdev, struct lm3642_chip_data, cdev_torch); int ret; =20 - mutex_lock(&chip->lock); + guard(mutex)(&chip->lock); chip->br_torch =3D brightness; ret =3D lm3642_control(chip, chip->br_torch, MODES_TORCH); - mutex_unlock(&chip->lock); return ret; } =20 @@ -249,10 +249,9 @@ static int lm3642_strobe_brightness_set(struct led_cla= ssdev *cdev, container_of(cdev, struct lm3642_chip_data, cdev_flash); int ret; =20 - mutex_lock(&chip->lock); + guard(mutex)(&chip->lock); chip->br_flash =3D brightness; ret =3D lm3642_control(chip, chip->br_flash, MODES_FLASH); - mutex_unlock(&chip->lock); return ret; } =20 @@ -264,10 +263,9 @@ static int lm3642_indicator_brightness_set(struct led_= classdev *cdev, container_of(cdev, struct lm3642_chip_data, cdev_indicator); int ret; =20 - mutex_lock(&chip->lock); + guard(mutex)(&chip->lock); chip->br_indicator =3D brightness; ret =3D lm3642_control(chip, chip->br_indicator, MODES_INDIC); - mutex_unlock(&chip->lock); return ret; } =20 --=20 2.51.0