From nobody Mon Feb 9 05:20:48 2026 Received: from smtp.smtpout.orange.fr (smtp-81.smtpout.orange.fr [80.12.242.81]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58D6C32E732; Wed, 28 Jan 2026 21:36:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.12.242.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769636179; cv=none; b=FKG/0dREWqMZVRBPfYJMZRt/odgSP9ctHaRaBpboEuyDr3ycqYzq6CY90HL/akkjWGtcLassbW9bLMYMcMV0K70ixxeGhMRt/rZOspcimk1fhXedhDIqIHZO1VUN0ypuRzPtHMphTrFV4Dw1haINGzKWV9YSoB62KCJ2qokaZdg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769636179; c=relaxed/simple; bh=DxIIjQuFx2X5vwctTB73xzLfmTjQiro48BHWprUY6kE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=AZ5TkDrZckZItK19/c08A+WMxpl+t7E+5qpBdOq+L43/8SuPMlCA4mCcQT5ESUXZWtQ7ooWbcyYQw1Y8R/OwJ/KXfAR7c/K0qd/qB7waNzjVw/iRbtthrhjEJZo0H6iTFAMM9pJqk5Kl3pGJsrqxqi9kkwalG+eSls5+blRAVNY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=orange.fr; spf=pass smtp.mailfrom=orange.fr; dkim=pass (2048-bit key) header.d=orange.fr header.i=@orange.fr header.b=i1/0Za00; arc=none smtp.client-ip=80.12.242.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=orange.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=orange.fr Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=orange.fr header.i=@orange.fr header.b="i1/0Za00" Received: from cyber-villager.home ([IPv6:2a01:cb1c:8326:c500:bfc0:b7c5:d0ed:4f38]) by smtp.orange.fr with ESMTPA id lD4SvI2AvEcXwlD4Svk1IB; Wed, 28 Jan 2026 22:27:30 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr; s=t20230301; t=1769635650; bh=esahnId/W+bwrnYCC8NREjRi6iSOW0UNlTcA4g2FuLk=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=i1/0Za00yQcwQ8kzuBpu4B/eky+iIvduq/rDDVCPbGdwU2k28XmQCxFNTNb0B3cB8 k3q9yP+BSsqC926s3ILm9A7eFiERVma+qC8SKnz6XZoN1z2F/pYYRABFE5SFCbQbie a0J2Zitmd2KrUKrDXXQSzcrFbt5mGEnUAyH4UCC/HGQ22Nv7PP5/L1YylFvdoXkE7S Ardxjjqm2Uih8Y4l2Ve0IVnB6cOcM6kiAy2E/yoRz0mLOq1m1vl3vg8Sp1rqz6pCEJ 6lRkVBoRxv63lUxEbv9Dzi9H69TPU7oc6wf99eUt30gPAbbduxSK7U9vSSEwL0Qp5/ foBI3NGbJNzxw== X-ME-Helo: cyber-villager.home X-ME-Auth: cGF1bC5yZXRvdXJuZUBvcmFuZ2UuZnI= X-ME-Date: Wed, 28 Jan 2026 22:27:30 +0100 X-ME-IP: 2a01:cb1c:8326:c500:bfc0:b7c5:d0ed:4f38 From: =?UTF-8?q?Paul=20Retourn=C3=A9?= To: andy@kernel.org, gregkh@linuxfoundation.org Cc: =?UTF-8?q?Paul=20Retourn=C3=A9?= , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: fbtft: use guard() to simplify code Date: Wed, 28 Jan 2026 22:26:42 +0100 Message-ID: <20260128212644.1170970-1-paul.retourne@orange.fr> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Use guard() to simplify mutex locking. No functional change. Signed-off-by: Paul Retourn=C3=A9 --- drivers/staging/fbtft/fb_ssd1305.c | 4 ++-- drivers/staging/fbtft/fb_ssd1306.c | 4 ++-- drivers/staging/fbtft/fbtft-sysfs.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/fbtft/fb_ssd1305.c b/drivers/staging/fbtft/fb_= ssd1305.c index 020fe48fed0be..d9215cb35e8f8 100644 --- a/drivers/staging/fbtft/fb_ssd1305.c +++ b/drivers/staging/fbtft/fb_ssd1305.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #include "fbtft.h" =20 @@ -35,12 +36,11 @@ static int init_display(struct fbtft_par *par) par->fbtftops.reset(par); =20 if (par->gamma.curves[0] =3D=3D 0) { - mutex_lock(&par->gamma.lock); + guard(mutex)(&par->gamma.lock); if (par->info->var.yres =3D=3D 64) par->gamma.curves[0] =3D 0xCF; else par->gamma.curves[0] =3D 0x8F; - mutex_unlock(&par->gamma.lock); } =20 /* Set Display OFF */ diff --git a/drivers/staging/fbtft/fb_ssd1306.c b/drivers/staging/fbtft/fb_= ssd1306.c index 478d710469b91..c230d599ff928 100644 --- a/drivers/staging/fbtft/fb_ssd1306.c +++ b/drivers/staging/fbtft/fb_ssd1306.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #include "fbtft.h" =20 @@ -34,12 +35,11 @@ static int init_display(struct fbtft_par *par) par->fbtftops.reset(par); =20 if (par->gamma.curves[0] =3D=3D 0) { - mutex_lock(&par->gamma.lock); + guard(mutex)(&par->gamma.lock); if (par->info->var.yres =3D=3D 64) par->gamma.curves[0] =3D 0xCF; else par->gamma.curves[0] =3D 0x8F; - mutex_unlock(&par->gamma.lock); } =20 /* Set Display OFF */ diff --git a/drivers/staging/fbtft/fbtft-sysfs.c b/drivers/staging/fbtft/fb= tft-sysfs.c index e45c90a03a903..72d6cf899336e 100644 --- a/drivers/staging/fbtft/fbtft-sysfs.c +++ b/drivers/staging/fbtft/fbtft-sysfs.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include + #include "fbtft.h" #include "internal.h" =20 @@ -95,14 +97,13 @@ sprintf_gamma(struct fbtft_par *par, u32 *curves, char = *buf) ssize_t len =3D 0; unsigned int i, j; =20 - mutex_lock(&par->gamma.lock); + guard(mutex)(&par->gamma.lock); for (i =3D 0; i < par->gamma.num_curves; i++) { for (j =3D 0; j < par->gamma.num_values; j++) len +=3D scnprintf(&buf[len], PAGE_SIZE, "%04x ", curves[i * par->gamma.num_values + j]); buf[len - 1] =3D '\n'; } - mutex_unlock(&par->gamma.lock); =20 return len; } @@ -124,11 +125,10 @@ static ssize_t store_gamma_curve(struct device *devic= e, if (ret) return ret; =20 - mutex_lock(&par->gamma.lock); + guard(mutex)(&par->gamma.lock); memcpy(par->gamma.curves, tmp_curves, par->gamma.num_curves * par->gamma.num_values * sizeof(tmp_curves[0])); - mutex_unlock(&par->gamma.lock); =20 return count; } --=20 2.52.0