Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3294562iob; Mon, 16 May 2022 18:26:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzY9HhL047/3ygqCPo9aNRDrp3XVdu5tteouDsIIsr9cfXXi+0NWAlWDbnIpGrO6wz255Ub X-Received: by 2002:a63:1c1:0:b0:3db:3d7d:fbca with SMTP id 184-20020a6301c1000000b003db3d7dfbcamr17083797pgb.461.1652750806635; Mon, 16 May 2022 18:26:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652750806; cv=none; d=google.com; s=arc-20160816; b=PFdl+buPcpYk8L7yKApIxO00oqBhD1NESg5io+KmCedTMxyaYd7mA7cRDoJtRYdv1C Xi3CSFTdtAjfZX/RpC+e3IwAmwCyFVVymFtJNaI/larTU9fKOf7wfrxBjIQ/x5oT0Rsr BPlGwjEpLJY1T4WQMPxyw9TWGTfdldywZuM9bbLvayMG7KKtpambI1/7FpNW9m1tw507 QSSusT93Pscs5qOg0ENnAoQTu7nPqGCqQFxfPNJBVOXvtLhbLKBcuPabmMLEuYhWMNWb zDSbblNrfNk8lu6J2y+kvMS5zZ6qWIJByhrDaw3hjnmVbHnRrrneyNV7jt+Rvp/ToVvQ BP1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:to:from; bh=iaJ/cs+kaOmG5DMsHq4YX0Yt286YeuhZ7r6iXUEAing=; b=jUzNYfMbGYeqkP/tG7LyvHGYpFyCioiwU1ypndt10hOPCS798ivGiBtaQ0x/UgZskP V6RAFKWp2EI3YxTMscY28B/FR2dw3Y5BOh0Jq+Z0Aw7JA8j6+MzgAlQUmmrVmeqbFHHK PX5SCDoLkw3W5m62Fb7Mac4xFEN5WcQd38YaiVyWDOWSWMKop3o6c24CsTMpMn/QOlTp a7KUYbkQemotWR2SO/K7Obxz+Uhrtmvyj8P0R+Ktgi9ldj74S54QivvE5OY4+4GPvdx1 aUYDxvQoUW72dPKFHgfmWYjcRSWdDyHsDzJBSBZdBMjJKD0LAp3E9Falo1rg9NlYpepm A7dg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bc11-20020a170902930b00b0015b55ac4024si13062803plb.324.2022.05.16.18.26.36; Mon, 16 May 2022 18:26:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240254AbiEPGZJ (ORCPT + 99 others); Mon, 16 May 2022 02:25:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234525AbiEPGZI (ORCPT ); Mon, 16 May 2022 02:25:08 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBD0F252AF for ; Sun, 15 May 2022 23:25:06 -0700 (PDT) Received: from kwepemi500015.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4L1q362pTCzhZGv; Mon, 16 May 2022 14:24:18 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemi500015.china.huawei.com (7.221.188.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 16 May 2022 14:25:04 +0800 From: Lu Wei To: , , , Subject: [PATCH net-next] ALSA: ice1724: return void from snd_vt1724_chip_init() Date: Mon, 16 May 2022 14:25:46 +0800 Message-ID: <20220516062546.253656-1-luwei32@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500015.china.huawei.com (7.221.188.92) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return int in snd_vt1724_chip_init() is useless since it always returns 0. Signed-off-by: Lu Wei --- sound/pci/ice1712/ice1724.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 6fab2ad85bbe..dfef468ad6dc 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -2347,7 +2347,7 @@ static void snd_vt1724_chip_reset(struct snd_ice1712 *ice) msleep(10); } -static int snd_vt1724_chip_init(struct snd_ice1712 *ice) +static void snd_vt1724_chip_init(struct snd_ice1712 *ice) { outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG)); outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG)); @@ -2369,8 +2369,6 @@ static int snd_vt1724_chip_init(struct snd_ice1712 *ice) * since they cause machine lockups */ outb(VT1724_MULTI_FIFO_ERR, ICEMT1724(ice, DMA_INT_MASK)); - - return 0; } static int snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice) @@ -2506,8 +2504,8 @@ static int snd_vt1724_create(struct snd_card *card, snd_vt1724_chip_reset(ice); if (snd_vt1724_read_eeprom(ice, modelname) < 0) return -EIO; - if (snd_vt1724_chip_init(ice) < 0) - return -EIO; + + snd_vt1724_chip_init(ice); return 0; } @@ -2702,11 +2700,7 @@ static int snd_vt1724_resume(struct device *dev) return 0; snd_vt1724_chip_reset(ice); - - if (snd_vt1724_chip_init(ice) < 0) { - snd_card_disconnect(card); - return -EIO; - } + snd_vt1724_chip_init(ice); if (ice->pm_resume) ice->pm_resume(ice); -- 2.17.1