Unverified Commit 9ed4c762 authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown
Browse files

ASoC: cs35l56: Don't return a value from cs35l56_remove() 



cs35l56_remove() always returns 0. Two of the functions that call
it are void and the other one should only return 0. So there's no
point returning anything from cs35l56_remove().

Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230414133753.653139-6-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4be47683

sound/soc/codecs/cs35l56-sdw.c

+3 −1
Original line number Diff line number Diff line
@@ -527,7 +527,9 @@ static int cs35l56_sdw_remove(struct sdw_slave *peripheral) 
	sdw_read_no_pm(peripheral, CS35L56_SDW_GEN_INT_STAT_1);

	sdw_write_no_pm(peripheral, CS35L56_SDW_GEN_INT_STAT_1, 0xFF);



	return cs35l56_remove(cs35l56);

	cs35l56_remove(cs35l56);



	return 0;

}



static const struct dev_pm_ops cs35l56_sdw_pm = {

sound/soc/codecs/cs35l56.c

+1 −3
Original line number Diff line number Diff line
@@ -1590,7 +1590,7 @@ int cs35l56_init(struct cs35l56_private *cs35l56) 
}

EXPORT_SYMBOL_NS_GPL(cs35l56_init, SND_SOC_CS35L56_CORE);



int cs35l56_remove(struct cs35l56_private *cs35l56)

void cs35l56_remove(struct cs35l56_private *cs35l56)

{

	cs35l56->init_done = false;
@@ -1613,8 +1613,6 @@ int cs35l56_remove(struct cs35l56_private *cs35l56) 


	gpiod_set_value_cansleep(cs35l56->reset_gpio, 0);

	regulator_bulk_disable(ARRAY_SIZE(cs35l56->supplies), cs35l56->supplies);



	return 0;

}

EXPORT_SYMBOL_NS_GPL(cs35l56_remove, SND_SOC_CS35L56_CORE);

sound/soc/codecs/cs35l56.h

+1 −1
Original line number Diff line number Diff line
@@ -76,6 +76,6 @@ irqreturn_t cs35l56_irq(int irq, void *data); 
int cs35l56_irq_request(struct cs35l56_private *cs35l56, int irq);

int cs35l56_common_probe(struct cs35l56_private *cs35l56);

int cs35l56_init(struct cs35l56_private *cs35l56);

int cs35l56_remove(struct cs35l56_private *cs35l56);

void cs35l56_remove(struct cs35l56_private *cs35l56);



#endif /* ifndef CS35L56_H */