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 410411F8905; Tue, 3 Dec 2024 15:48:42 +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=1733240922; cv=none; b=U89F8eRhhkN7ydq4sZ03VSbP9NRt11WR7lVkSK4QKbeFbjcJLtGv4GBBbHfNsY9OrBYcBDrVeXSSuxHzRIQvlx12iUJh8ZFWYSlC+Jnp2oaxacLQB1bZpnOBc1+6u13SG9Dvp9EwB45n1nvmCm2Oz33/Wa+o9Vhj04FUYI0FBto= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733240922; c=relaxed/simple; bh=dZy1vqqjfz9/mzzf2IaVyKqSZv1hPZgO+srF1b1jq0g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KoBnfJdWbGG58bkZDPV1SaaPTlQL+/C3KJUqPRRgq6BHj037TX02CSgdQowVHJSu5XLcDW3RJ8kDHGBU74Vq45tN/ioNhZkmmfkXeDIvpPC8L+3GVUoL5JzWrSmNnrekR5KQyTEjVYrRJ09fVpxkdswHOEEScUc6pBKKHEqDCZs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CY+vd3yV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CY+vd3yV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3D96C4CECF; Tue, 3 Dec 2024 15:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733240922; bh=dZy1vqqjfz9/mzzf2IaVyKqSZv1hPZgO+srF1b1jq0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CY+vd3yV2nSRvqieFatkLZT8iU4rEBs8SZS5ksPV5Pf0eHmbNE+V2o8Z06dBQgUN1 pTlNapabDD+5mc7OajQ378UL0m8buD0H4ZZn1ekzQVVbvmFUqsgi9xs4hcwOzVqMTF ZX6uBgX4gjM2F5Hd9bBLg4dYDHQehAp30G1oEM7g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shuah Khan , "Everest K.C." , Mark Brown , Sasha Levin Subject: [PATCH 6.12 244/826] ASoC: rt722-sdca: Remove logically deadcode in rt722-sdca.c Date: Tue, 3 Dec 2024 15:39:31 +0100 Message-ID: <20241203144753.284904089@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203144743.428732212@linuxfoundation.org> References: <20241203144743.428732212@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Everest K.C [ Upstream commit 22206e569fb54bf9c95db9a0138a7485ba9e13bc ] As the same condition was checked in inner and outer if statements. The code never reaches the inner else statement. Fix this by removing the logically dead inner else statement. Fixes: 7f5d6036ca00 ("ASoC: rt722-sdca: Add RT722 SDCA driver") Reported-by: Shuah Khan Closes: https://lore.kernel.org/all/e44527e8-b7c6-4712-97a6-d54f02ad2dc9@linuxfoundation.org/ Signed-off-by: Everest K.C. Reviewed-by: Shuah Khan Link: https://patch.msgid.link/20241010175755.5278-1-everestkc@everestkc.com.np Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt722-sdca.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt722-sdca.c b/sound/soc/codecs/rt722-sdca.c index e5bd9ef812de1..f9f7512ca3608 100644 --- a/sound/soc/codecs/rt722-sdca.c +++ b/sound/soc/codecs/rt722-sdca.c @@ -607,12 +607,8 @@ static int rt722_sdca_dmic_set_gain_get(struct snd_kcontrol *kcontrol, if (!adc_vol_flag) /* boost gain */ ctl = regvalue / boost_step; - else { /* ADC gain */ - if (adc_vol_flag) - ctl = p->max - (((vol_max - regvalue) & 0xffff) / interval_offset); - else - ctl = p->max - (((0 - regvalue) & 0xffff) / interval_offset); - } + else /* ADC gain */ + ctl = p->max - (((vol_max - regvalue) & 0xffff) / interval_offset); ucontrol->value.integer.value[i] = ctl; } -- 2.43.0