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 1FA76168AD for ; Mon, 8 May 2023 11:21:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89EF5C433EF; Mon, 8 May 2023 11:21:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683544884; bh=vtQw2JJviDw8t430Txk3zxbmPoFVNuxUY27ZxlH8H2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oPhAr724WZ9w/scDxFkUe3C00SopQV3qqLO5pLav8kUORI0mfF7ZDtL9vCTNmfB47 ClQzdrc5iVa2Dl18CLfdhmI9bq0cZTbbt9ZoVDK2XBRzfj2thupndfBA54HuBMoaBG 9JrsxcJM5okvQWpDrYOWXSERE5MfgBHr3eBKphaw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dhruva Gole , Mark Brown , Sasha Levin Subject: [PATCH 6.3 555/694] spi: bcm63xx: remove PM_SLEEP based conditional compilation Date: Mon, 8 May 2023 11:46:30 +0200 Message-Id: <20230508094452.608731458@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230508094432.603705160@linuxfoundation.org> References: <20230508094432.603705160@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Dhruva Gole [ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] Get rid of conditional compilation based on CONFIG_PM_SLEEP because it may introduce build issues with certain configs where it maybe disabled This is because if above config is not enabled the suspend-resume functions are never part of the code but the bcm63xx_spi_pm_ops struct still inits them to non-existent suspend-resume functions. Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") Signed-off-by: Dhruva Gole Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-bcm63xx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 787625ce700cb..d500fcbe2198f 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -629,7 +629,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP static int bcm63xx_spi_suspend(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); @@ -656,7 +655,6 @@ static int bcm63xx_spi_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops bcm63xx_spi_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) -- 2.39.2