From mboxrd@z Thu Jan 1 00:00:00 1970 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 815FC216199; Sun, 24 Mar 2024 23:09:18 +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=1711321759; cv=none; b=bLzKR9LsL0fvLxj0GIpIDx+LhCEjE9sKlxSZ0DKOmGEAhWX+rAwUdPOOmcIacBrqGnjPW39B1JHsqHX7JOPHj47/J1RGY8b1yD2APDYOwYHxj2bmU8pTFC8U6inazN32oLhemlAFtF+hBy/Vih1NOFWKtUiGoxwpt6x3Q0v+Res= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321759; c=relaxed/simple; bh=ZvvuP1gdaEvy16AYadR6zQ+/sr0t4GLSEw8KeAIDwLk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CaVAUSzmbp5AWrRDUUfWRqxZm3oBZGMHtRCaGmN3BUTU2oeCDfj5T6h7zCpADA3XWuqrtHLsQNoHTYBViDQULtWYGXKlNBNB/WIUJbg4x+jnBOEx3nmyzQ9OSsKVtWqds2XfdVG4gnLlKKGvOnkhOn/QT+Pj6fvdkH9rEmds7PQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=icIUBOjq; 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="icIUBOjq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACCA5C433C7; Sun, 24 Mar 2024 23:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321758; bh=ZvvuP1gdaEvy16AYadR6zQ+/sr0t4GLSEw8KeAIDwLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=icIUBOjqvG5rMGQ46odkFZ0NLlLqSlXzF0BYsfA+RaY75ZHTvmDh6CH/x1dtC1Pql kkALG0Klf/Jaib4yj7MEe0PUaBvEM/tvi0pCV61/f8kKh/iaxB+szWk5VaIi4u5t3Q AayHZWwndk25JUBtwc1gVvLEPrquUU0hXJX4JE5hiyuOoAMPPqK2K0+BC2Iqgkt1XQ iZ6qfPLq2R/M6mlFhKcRmKIqzp6BQUf6cyWfgH8RPcFDgBeotFxBP+Tf4Ak1ql5OYh iysQwMQoPkN+STTrq5C6la5D2xGzsW/40h0nJmgx0rmraGjGk0qOimp3YKW9Mv7oFT 2nDwM1pFyBV8A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luca Weiss , Daniel Thompson , Lee Jones , Sasha Levin Subject: [PATCH 6.6 486/638] backlight: lm3630a: Don't set bl->props.brightness in get_brightness Date: Sun, 24 Mar 2024 18:58:43 -0400 Message-ID: <20240324230116.1348576-487-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-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: 8bit 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@z3ntu.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 2e2240b278482..7115d7bb2a141 100644 --- a/drivers/video/backlight/lm3630a_bl.c +++ b/drivers/video/backlight/lm3630a_bl.c @@ -233,7 +233,7 @@ static int lm3630a_bank_a_get_brightness(struct backlight_device *bl) if (rval < 0) goto out_i2c_err; brightness |= rval; - goto out; + return brightness; } /* disable sleep */ @@ -244,11 +244,8 @@ static int lm3630a_bank_a_get_brightness(struct backlight_device *bl) rval = lm3630a_read(pchip, REG_BRT_A); if (rval < 0) goto out_i2c_err; - brightness = rval; + return rval; -out: - bl->props.brightness = brightness; - return bl->props.brightness; out_i2c_err: dev_err(pchip->dev, "i2c failed to access register\n"); return 0; @@ -310,7 +307,7 @@ static int lm3630a_bank_b_get_brightness(struct backlight_device *bl) if (rval < 0) goto out_i2c_err; brightness |= rval; - goto out; + return brightness; } /* disable sleep */ @@ -321,11 +318,8 @@ static int lm3630a_bank_b_get_brightness(struct backlight_device *bl) rval = lm3630a_read(pchip, REG_BRT_B); if (rval < 0) goto out_i2c_err; - brightness = rval; + return rval; -out: - bl->props.brightness = brightness; - return bl->props.brightness; out_i2c_err: dev_err(pchip->dev, "i2c failed to access register\n"); return 0; -- 2.43.0