Commit 26a526c2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Bjorn Andersson
Browse files

soc: qcom: spm: fix building with CONFIG_REGULATOR=n 



The newly added code causes a build failure when -Werror is set:

drivers/soc/qcom/spm.c:388:12: error: 'spm_get_cpu' defined but not used [-Werror=unused-function]

Remove the #ifdef and instead use an IS_ENABLED() check that lets the
compiler perform dead code elimination instead of the preprocessor.

Fixes: 6496dba1 ("soc: qcom: spm: add support for voltage regulator")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20240221154457.2007420-1-arnd@kernel.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent aa05f474

drivers/soc/qcom/spm.c

+4 −8
Original line number Diff line number Diff line
@@ -411,7 +411,6 @@ static int spm_get_cpu(struct device *dev) 
	return -EOPNOTSUPP;

}



#ifdef CONFIG_REGULATOR

static int spm_register_regulator(struct device *dev, struct spm_driver_data *drv)

{

	struct regulator_config config = {
@@ -474,12 +473,6 @@ static int spm_register_regulator(struct device *dev, struct spm_driver_data *dr 


	return 0;

}

#else

static int spm_register_regulator(struct device *dev, struct spm_driver_data *drv)

{

	return 0;

}

#endif



static const struct of_device_id spm_match_table[] = {

	{ .compatible = "qcom,sdm660-gold-saw2-v4.1-l2",
@@ -559,7 +552,10 @@ static int spm_dev_probe(struct platform_device *pdev) 
	if (drv->reg_data->reg_offset[SPM_REG_SPM_CTL])

		spm_set_low_power_mode(drv, PM_SLEEP_MODE_STBY);



	if (IS_ENABLED(CONFIG_REGULATOR))

		return spm_register_regulator(&pdev->dev, drv);



	return 0;

}



static struct platform_driver spm_driver = {