mfd: mc13xxx-spi: fix merge conflict

PATCH In review Axel Lin 2 participants 2 messages Jul 2, 2012 Multifunction devices (MFD)

Share & tools

Axel Lin

author

2012-07-02 08:03 UTC #0 lore raw

PATCH 1/1 mfd: mc13xxx-spi: fix merge conflict

This patch fixes conflict between commit 8ae3559 "mfd: mc13xxx workaround SPI hardware bug on i.Mx" and commit 10c7a5d "mfd: Use devm_* APIs for mc13xxx".

commit 8ae3559 changes regmap_init_spi to regmap_init.
So now we need to use devm_regmap_init rather than devm_regmap_init_spi.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/mfd/mc13xxx-spi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

drivers/mfd/mc13xxx-spi.c +3 -1

index 234207f..3563626 100644
@@ -139,7 +139,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
 	mc13xxx->dev = &spi->dev;
 	mutex_init(&mc13xxx->lock);
 
-	mc13xxx->regmap = devm_regmap_init_spi(spi, &mc13xxx_regmap_spi_config);
+	mc13xxx->regmap = devm_regmap_init(&spi->dev, &regmap_mc13xxx_bus,
+					   &spi->dev,
+					   &mc13xxx_regmap_spi_config);
 	if (IS_ERR(mc13xxx->regmap)) {
 		ret = PTR_ERR(mc13xxx->regmap);
 		dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",

Signature · 1 line

1.7.9.5

Samuel Ortiz

2012-07-02 14:42 UTC #1 lore raw

Hi Axel,

Quoted 6 lines · Axel Lin

This patch fixes conflict between commit 8ae3559 "mfd: mc13xxx workaround SPI hardware bug on i.Mx" and commit 10c7a5d "mfd: Use devm_* APIs for mc13xxx".
commit 8ae3559 changes regmap_init_spi to regmap_init.
So now we need to use devm_regmap_init rather than devm_regmap_init_spi.

Good catch, thanks a lot.

Cheers,
Samuel.

Signature · 2 lines

Intel Open Source Technology Centre
http://oss.intel.com/