From nobody Fri Dec 19 21:47:29 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E945180B9A; Sun, 24 Mar 2024 23:49:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324149; cv=none; b=ONDIhof5vRC0nYDl8Ner97dfm7+FGwD7Ak1dGI2rVEMJte9E0nIqD6YnMMKyGVQoynnvhERLgZhkhxz0KdquGx8C4b7LReCl6RgpjXwIFpAym2YvfUIoP3BsU1/aDWkL9dOd3xlxz9zy6G5Tqj67WDT0p4qZ8EJyygK8Unpy2k0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324149; c=relaxed/simple; bh=DkPsYCJzAMNA9hIGOY0tKbqRcqHXIfHtmZWh/cCKJbY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gw9dQMSPpcptYD87umn55ltAt3AbxQvEtVlk4I08Zxrpo8f7tjhcWYX6DuX752czoH7MlYpNdZPnqumw8xk+y0mhl33CKySHVQbF3udoG9gC43YjX/sXYTPaSOwAVYA267zgbhfjHjXPVXHW6QVzyK1nrz6F0e+plTzBky6S1z8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W+DM1k1+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W+DM1k1+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AEB1C433A6; Sun, 24 Mar 2024 23:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324149; bh=DkPsYCJzAMNA9hIGOY0tKbqRcqHXIfHtmZWh/cCKJbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W+DM1k1+/CtmmosI7h7gWjsDWLPSQ7gKK5ALiWgwzH4d946GfLKsYxW4sKglY23Wb i//KCv7GzyySlkiZqFRl+0l393fnkBNsw6vTUHxDm1Tn+6laQUSbU8Bu7u5fUHhhd5 uwAD8Oo9XZ70HKfq2a4T9Q3Gt8+tM3BygbsBR/KnE7Id881bOfNKxFdGxRFGn5lG9k CrO4QyemMZmmNMs17v+l9ZgIU+4plYp8utR6dX+PRwxf+wRTz9zltw/nDH7bl8T/7+ fXOe4RutCY4z7T9C8O2BpOVXyRcVSC1t0zVMOx7Xji37ZCZ82icXkvtpdaHwIHQMgA XSyDiPbKNgd7w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luca Weiss , Daniel Thompson , Lee Jones , Sasha Levin Subject: [PATCH 5.4 145/183] backlight: lm3630a: Don't set bl->props.brightness in get_brightness Date: Sun, 24 Mar 2024 19:45:58 -0400 Message-ID: <20240324234638.1355609-146-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234638.1355609-1-sashal@kernel.org> References: <20240324234638.1355609-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Luca Weiss [ Upstream commit 4bf7ddd2d2f0f8826f25f74c7eba4e2c323a1446 ] There's no need to set bl->props.brightness, the get_brightness function is just supposed to return the current brightness and not touch the struct. With that done we can also remove the 'goto out' and just return the value. Fixes: 0c2a665a648e ("backlight: add Backlight driver for lm3630 chip") Signed-off-by: Luca Weiss Reviewed-by: Daniel Thompson Link: https://lore.kernel.org/r/20240220-lm3630a-fixups-v1-2-9ca62f7e4a33@z= 3ntu.xyz Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/video/backlight/lm3630a_bl.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/video/backlight/lm3630a_bl.c b/drivers/video/backlight= /lm3630a_bl.c index a381b3990986d..8d22ba62d78b0 100644 --- a/drivers/video/backlight/lm3630a_bl.c +++ b/drivers/video/backlight/lm3630a_bl.c @@ -227,7 +227,7 @@ static int lm3630a_bank_a_get_brightness(struct backlig= ht_device *bl) if (rval < 0) goto out_i2c_err; brightness |=3D rval; - goto out; + return brightness; } =20 /* disable sleep */ @@ -238,11 +238,8 @@ static int lm3630a_bank_a_get_brightness(struct backli= ght_device *bl) rval =3D lm3630a_read(pchip, REG_BRT_A); if (rval < 0) goto out_i2c_err; - brightness =3D rval; + return rval; =20 -out: - bl->props.brightness =3D brightness; - return bl->props.brightness; out_i2c_err: dev_err(pchip->dev, "i2c failed to access register\n"); return 0; @@ -304,7 +301,7 @@ static int lm3630a_bank_b_get_brightness(struct backlig= ht_device *bl) if (rval < 0) goto out_i2c_err; brightness |=3D rval; - goto out; + return brightness; } =20 /* disable sleep */ @@ -315,11 +312,8 @@ static int lm3630a_bank_b_get_brightness(struct backli= ght_device *bl) rval =3D lm3630a_read(pchip, REG_BRT_B); if (rval < 0) goto out_i2c_err; - brightness =3D rval; + return rval; =20 -out: - bl->props.brightness =3D brightness; - return bl->props.brightness; out_i2c_err: dev_err(pchip->dev, "i2c failed to access register\n"); return 0; --=20 2.43.0