From patchwork Fri Jul 15 09:09:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12918950 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BF9C9CCA47C for ; Fri, 15 Jul 2022 09:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Abc1EXsEJTa5UfazYsWWyCN3cceGBsOcdjntXvEDU5w=; b=j4n7dmJMUQNMFO MUvQDktVd4Ru6/x4V3EGmilwVAjfk0YSzRh6G+psNjOJXoGmF62mBVQk4prFS9Aaux1wOMXi+2/S2 PtpoGKdD0Bh5F+bU6ZFU41wGMwLXSobWEG4nFJ3Ch//CER9qSzyVx55UXUsZIzGdfDd+BHFTL/GVZ vihnvd5Dtm53kclcVYIYgoZ6v24BbAc9LQc+TnHAYmql+SAH6a9mhX2ddFliFVnzm4Cl63bZmMm7Q YIjDODMfBOfAZ/Cz4piJRczfRe0PHojZncLyMakCQv8uRsro9Q2IrQustCMe3QMppLJlE7qb+N3jd DEooKPwnmsQKsJcu7p3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCHIJ-005zqP-Va; Fri, 15 Jul 2022 09:07:32 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCHIF-005ziH-8T for linux-arm-kernel@lists.infradead.org; Fri, 15 Jul 2022 09:07:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1657876047; x=1689412047; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xt3Cr4DjUR6uWFdmfg6tQgONs9dbD7Y0B6+swnrcj5A=; b=blsBI++5dHv5Tbhywy8IWPdkLZEkfoip1Fah/EmrDx5act8hLlOpPegO r6WDJr3JmEuXvmfTkQEYAt8l3A3dCtIDzBnbcm/iPfDmOPvAR1R21z7ur dQx5z1MI82RglIgCWbitzK5NBmN12Kx6H0oayiTN2A2IIBvapx6P5VYPE Pu5JdmKnDxGfda+2O3IEatfgbwaNTFeq7dIUVlAHGuVrWLf1Ka/gkZliC fYtv3ye6mnr6ZJTn5JnW0Cny5wVvUbzsOlKvRQxYOnah4YhuzSiUkZyRm HwNE1gXQLX/mxu7XhSnkWl8ZlFgCbZlWymgabV/qfkkIoZF5LHI45G6pG w==; X-IronPort-AV: E=Sophos;i="5.92,273,1650956400"; d="scan'208";a="104601118" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 15 Jul 2022 02:07:15 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 15 Jul 2022 02:07:15 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Fri, 15 Jul 2022 02:07:12 -0700 From: Claudiu Beznea To: , , , , , CC: , , , Claudiu Beznea Subject: [PATCH] ASoC: atmel_ssc_dai: remove #ifdef CONFIG_PM Date: Fri, 15 Jul 2022 12:09:39 +0300 Message-ID: <20220715090939.1679963-1-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220715_020727_405334_4E3FB13F X-CRM114-Status: UNSURE ( 9.00 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove #ifdef CONFIG_PM and use pm_ptr() instead. Signed-off-by: Claudiu Beznea --- sound/soc/atmel/atmel_ssc_dai.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 8aae0beadcfe..e868b7e028d6 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -762,7 +762,6 @@ static int atmel_ssc_trigger(struct snd_pcm_substream *substream, return 0; } -#ifdef CONFIG_PM static int atmel_ssc_suspend(struct snd_soc_component *component) { struct atmel_ssc_info *ssc_p; @@ -821,10 +820,6 @@ static int atmel_ssc_resume(struct snd_soc_component *component) return 0; } -#else /* CONFIG_PM */ -# define atmel_ssc_suspend NULL -# define atmel_ssc_resume NULL -#endif /* CONFIG_PM */ #define ATMEL_SSC_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) @@ -859,8 +854,8 @@ static struct snd_soc_dai_driver atmel_ssc_dai = { static const struct snd_soc_component_driver atmel_ssc_component = { .name = "atmel-ssc", - .suspend = atmel_ssc_suspend, - .resume = atmel_ssc_resume, + .suspend = pm_ptr(atmel_ssc_suspend), + .resume = pm_ptr(atmel_ssc_resume), .legacy_dai_naming = 1, };