From patchwork Sun Jun 5 15:39:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 578875 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C0A6C43334 for ; Sun, 5 Jun 2022 15:40:37 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D427F1900; Sun, 5 Jun 2022 17:39:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D427F1900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654443634; bh=6hY9gRpUjWKHjJ/A9SAH4/Bd42zGqX34ZSYebkngAI8=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=URHiSPh70Ajil+siudgxjHHugShCcAXHkfgQAZQDeisF0hl091uFZYsGqI11f+ZTN wZBuD7fO1Y+Pn4aUnUsAQEkdX/VcbfxNEPIQ4ZKXffFGZXaXzUZugJpi7xCe/Cumo5 1+TvzJSnHNuwNgIxNCixUgTVaZpuHa4iKeL2ySIg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 72C96F80132; Sun, 5 Jun 2022 17:39:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E346EF800D3; Sun, 5 Jun 2022 17:39:42 +0200 (CEST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E547AF800D3 for ; Sun, 5 Jun 2022 17:39:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E547AF800D3 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nxsLX-0002W8-2B; Sun, 05 Jun 2022 17:39:19 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nxsLU-006dEJ-Rs; Sun, 05 Jun 2022 17:39:15 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nxsLS-00ENhP-QT; Sun, 05 Jun 2022 17:39:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown Subject: [PATCH] ASoC: Intel: broadwell: Make broadwell_disable_jack() return void Date: Sun, 5 Jun 2022 17:39:04 +0200 Message-Id: <20220605153904.26921-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1610; h=from:subject; bh=6hY9gRpUjWKHjJ/A9SAH4/Bd42zGqX34ZSYebkngAI8=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBinM4UbzQW+etNJg8KpfPRlXzGqaPA1oekDxVlFzD7 M8BisUCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpzOFAAKCRDB/BR4rcrsCViuB/ 44oUvYgrHLE9DeGxy4x9n/AeY3uGa5iCy+rjh6KqySScePqP5akcATWXF9RJ5/ju1khF399mqthQux LSgvf/L+uvTn9glTKNEn6DH43aCnVglEhdHm5Hb1dgY0q8mP9Zqj7bWzAWr8WFogEStadOSgAy34+n IuMBLjpKBzI1GtKVS8hJruMQ0vrNjwjv86QbIdNgNYrTui4viudhpv2c+fsiC7jXaBhSlg+f19m/o6 yoTX/EhRBVgdG4L5BAP8fNZqPIWO6n4DV3yIsdm4CukIuexxrY75CnuUO6VvtpkHAU3rc5GdzhAYq5 zqFB8wUyqQ3oYgax0jZueSZDp0D8XH X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: alsa-devel@alsa-project.org Cc: alsa-devel@alsa-project.org, Takashi Iwai , kernel@pengutronix.de X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" broadwell_disable_jack() returns zero unconditionally. Letting it return void instead makes it easier to see in the callers that there is no error to handle. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König Acked-by: Pierre-Louis Bossart --- sound/soc/intel/boards/broadwell.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) base-commit: 4b0986a3613c92f4ec1bdc7f60ec66fea135991f diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index d37c74fd1a3c..280e84bbe185 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -227,7 +227,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { }, }; -static int broadwell_disable_jack(struct snd_soc_card *card) +static void broadwell_disable_jack(struct snd_soc_card *card) { struct snd_soc_component *component; @@ -239,13 +239,13 @@ static int broadwell_disable_jack(struct snd_soc_card *card) break; } } - - return 0; } static int broadwell_suspend(struct snd_soc_card *card) { - return broadwell_disable_jack(card); + broadwell_disable_jack(card); + + return 0; } static int broadwell_resume(struct snd_soc_card *card){ @@ -315,7 +315,9 @@ static int broadwell_audio_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - return broadwell_disable_jack(card); + broadwell_disable_jack(card); + + return 0; } static struct platform_driver broadwell_audio = {