From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 D25DF44C4E3 for ; Thu, 23 Jul 2026 18:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832401; cv=none; b=bRRqw2gTALjpZljB9985E1nNvq21NbYUF1CfDW7KwPVU/2Lgs8RZJRs0QTAn0owU/JJNQN9I7UYsj6fvWHq7sqDqt2G9jbY/edmbWxPzd5183g/0h0aDBcCH7KTTTVbfZ4ICamB34h7PERRDu/4fwE+NKU54DEpEzzJDM1T+mS4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832401; c=relaxed/simple; bh=pC3jMvPYeSyszM8A/kaY0D7/tPIf7nyRWa6KlRbsfEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E7YeshJPFTTV6Wj0C6wU11K4hfTgqs4W6Whz8f2QrBVhPTSpLawj6wGtorSqN/kX0tV325aWQqKE6k96Y4KF9ZwIK73ey2koGOl/+FBlBWsGWnNwxlGLaJBpK2779HoNcI8fmUJyz8i2D97o7LD2jdE5D1HodO1bUWir71sm4K0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=sXXt00zT; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sXXt00zT" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-38e3617ba36so977275a91.3 for ; Thu, 23 Jul 2026 11:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784832394; x=1785437194; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=bRDMoftjJ5LuSOG2BSFEOMESTYAdiLdW60GLICnyHDg=; b=sXXt00zT31L7vRa+Soa6xZPX0g2hjFDNeh0iULYKOf2acqU8NeJN/CTEoPHjCq89oG L0p3NrkiDkMy/m74uo3NUCWjX6MafmcMw+Ezljhc++i+MNuqx3MOkJ3eVA3q7q/bt8Z+ 1+zUMvwsebIeTVwL/ynelnc4pIpvGJs4EEKRsdw4WZjnTFrjVhi/6VSnQC9f/VKSsMnL Qq82EjxV7lLmG7+Sbtf1UxAZek6TPIJ8F9EwslrO0tOORtLcG3LRqIVPSjnbfePHC0nH VsWpTP7DcxvV6YtBrsY7rFPiji5zR9GYsepQPfm0PpL/Up9aYFUpL7hQubEt7DBd8IWw RzMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784832394; x=1785437194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=bRDMoftjJ5LuSOG2BSFEOMESTYAdiLdW60GLICnyHDg=; b=e8DpHMCDOAgxUWvqtI8/hxS9ceDmb7eqyACUChJDOWadOvqijDLx995keqLaRE8iD1 WmrpVCslBREhcLbTLjmiWLdlzfN8nPb3hgqVBCIWo8AS0O4RO0MpQ0mvJ1G3c5VD1I6S NeXH7W/bY/29Kqs9brTSyyO5mi2pzjJiHLMQNIqJQTB5IPYlHVzUHWWaPELuVi8+jBzo KAUlpk6v/HP1MCfE2DwUfWigXdConR81hRICwKPsQ4z9Goa/Ke0OgKfAv7nKepH1Vozb hsA93Qc65MDoQUz3675JWuFy94m9bfwquckUYE6VAxeGRlbprQg3vH5ACs0BG2AdqpHP pY3g== X-Forwarded-Encrypted: i=1; AHgh+RorGnvPXw7ujrCD+DO4k+Zzh1xG9TYTfsa9IcTyPqtZImWSspUxmH1lzyADzBluk/i0Q0njWFltgsx/h78=@vger.kernel.org X-Gm-Message-State: AOJu0YzvYawv9r7G5l71UcdURyUocHIfuBxV4HjmSFXeQJH5wivrCjBV P1GxTpwXhcqxV8tJrKCyySe/ISLmvkEtIs9MrDPlQu2wJ+SLi0gvegW6 X-Gm-Gg: AR+sD11QJgi3t4WRauZ93FocFhBuhFLK0vWedjteAxnqRmvXZe0obwpB7hf4J16fOuK cB4z/3AB/aS5DaJOAyTXR4epV+lkjbtT5Dkwr0rfl9L6p5rw4DfwNurUfxBgRkkURVOBJKuQoq2 U9LFsouXelDOU8Y+ryA1VnOMfrTGV0y+zQ5VsHA0cJhHX8MzOKZ8kV3+4yZncPltbzRljeoOmmh yK3dNCViHhN1C129hizWu5ZTqIp1OguLZhaC7Pu7v25Cmt+v0CtH8vKM23cmEmWalvoYyEf6J2n 6vSBCXiOc28Oln3Ye0u+Ol7outWY8AriRGZMMjtBJ4zYz5rxrD9jbvdDEGS9oLY4CmnUR1n2tRB VU3uvmoie5T7RGz0sQPuo0f0SYCRoxBoJCA9KvWf9xRkKQ6ZW/OLPUIWr8z9FUMZW5/T+NR+y X-Received: by 2002:a17:90b:5905:b0:37f:9ce1:736b with SMTP id 98e67ed59e1d1-38ec6a7a521mr3865959a91.33.1784832393651; Thu, 23 Jul 2026 11:46:33 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f03af8a45sm308155a91.10.2026.07.23.11.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 11:46:32 -0700 (PDT) From: Sang-Heon Jeon To: Julia.Lawall@inria.fr, Jaroslav Kysela , Takashi Iwai Cc: cocci@inria.fr, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org Subject: [PATCH 13/36] ALSA: remove conditional return with no effect Date: Fri, 24 Jul 2026 03:45:15 +0900 Message-ID: <20260723184538.3888637-14-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723184538.3888637-1-ekffu200098@gmail.com> References: <20260723184538.3888637-1-ekffu200098@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Both branches of the check return the same value, so the check has no effect. Remove it and return the value directly. This is the result of running the Coccinelle script from scripts/coccinelle/misc/cond_return_no_effect.cocci. Signed-off-by: Sang-Heon Jeon --- sound/pci/echoaudio/echoaudio_dsp.c | 6 +----- sound/pci/echoaudio/layla24_dsp.c | 6 +----- sound/pci/riptide/riptide.c | 5 +---- sound/usb/mixer_scarlett.c | 26 ++++++++++---------------- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c index 4dd494508c9b..90d7f364d2b3 100644 --- a/sound/pci/echoaudio/echoaudio_dsp.c +++ b/sound/pci/echoaudio/echoaudio_dsp.c @@ -496,11 +496,7 @@ static int load_firmware(struct echoaudio *chip) if (err < 0) return err; - box_type = load_asic(chip); - if (box_type < 0) - return box_type; /* error */ - - return box_type; + return load_asic(chip); } diff --git a/sound/pci/echoaudio/layla24_dsp.c b/sound/pci/echoaudio/layla24_dsp.c index e7b8f5fe7753..6ed485acd618 100644 --- a/sound/pci/echoaudio/layla24_dsp.c +++ b/sound/pci/echoaudio/layla24_dsp.c @@ -54,11 +54,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) return err; chip->bad_board = false; - err = init_line_levels(chip); - if (err < 0) - return err; - - return err; + return init_line_levels(chip); } diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 99c00e46ce23..fa9cbeb43f15 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1957,10 +1957,7 @@ static int snd_riptide_mixer(struct snd_riptide *chip) chip->ac97_bus = pbus; ac97.pci = chip->pci; - err = snd_ac97_mixer(pbus, &ac97, &chip->ac97); - if (err < 0) - return err; - return err; + return snd_ac97_mixer(pbus, &ac97, &chip->ac97); } #ifdef SUPPORT_JOYSTICK diff --git a/sound/usb/mixer_scarlett.c b/sound/usb/mixer_scarlett.c index 673eb8d8724d..b500d6d45e66 100644 --- a/sound/usb/mixer_scarlett.c +++ b/sound/usb/mixer_scarlett.c @@ -1383,15 +1383,13 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer) return err; /* initialize sampling rate to 48000 */ - err = snd_usb_ctl_msg(mixer->chip->dev, - usb_sndctrlpipe(mixer->chip->dev, 0), UAC2_CS_CUR, - USB_RECIP_INTERFACE | USB_TYPE_CLASS | - USB_DIR_OUT, 0x0100, snd_usb_ctrl_intf(mixer->hostif) | - (0x29 << 8), sample_rate_buffer, 4); - if (err < 0) - return err; - - return err; + return snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + UAC2_CS_CUR, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, + 0x0100, + snd_usb_ctrl_intf(mixer->hostif) | (0x29 << 8), + sample_rate_buffer, 4); } /* @@ -1446,11 +1444,7 @@ int snd_forte_controls_create(struct usb_mixer_interface *mixer) } /* val_len == 1 and UAC2_CS_MEM */ - err = add_new_ctl(mixer, &usb_scarlett_ctl_sync, NULL, 0x3c, 0x00, 2, - USB_MIXER_U8, 1, "Sample Clock Sync Status", - &opt_sync, &elem); - if (err < 0) - return err; - - return err; + return add_new_ctl(mixer, &usb_scarlett_ctl_sync, NULL, 0x3c, 0x00, 2, + USB_MIXER_U8, 1, "Sample Clock Sync Status", + &opt_sync, &elem); } -- 2.43.0