Subject: linux-next: manual merge of the mfd tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 22 May 2012 14:10:11 +1000

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/da9052-core.c between commit 8614419451d8 ("mfd: da9052: Fix
genirq abuse") from Linus' tree and commit 16e5e204c928 ("mfd: Add ADC
support to the DA9052/53 core") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/mfd/da9052-core.c
index 7776aff,5036cf5..0000000
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@@ -663,8 -795,15 +795,14 @@@ int __devinit da9052_device_init(struc
  	if (ret < 0)
  		goto regmap_err;
  
 -	desc = irq_to_desc(da9052->chip_irq);
 -	da9052->irq_base = regmap_irq_chip_get_base(desc->action->dev_id);
 +	da9052->irq_base = regmap_irq_chip_get_base(da9052->irq_data);
  
+ 	ret = request_threaded_irq(DA9052_IRQ_ADC_EOM, NULL, da9052_auxadc_irq,
+ 				   IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ 				   "adc irq", da9052);
+ 	if (ret != 0)
+ 		dev_err(da9052->dev, "DA9052 ADC IRQ failed ret=%d\n", ret);
+ 
  	ret = mfd_add_devices(da9052->dev, -1, da9052_subdev_info,
  			      ARRAY_SIZE(da9052_subdev_info), NULL, 0);
  	if (ret)
@@@ -680,7 -820,9 +819,8 @@@ regmap_err
  
  void da9052_device_exit(struct da9052 *da9052)
  {
+ 	free_irq(DA9052_IRQ_ADC_EOM, da9052);
 -	regmap_del_irq_chip(da9052->chip_irq,
 -			    irq_get_irq_data(da9052->irq_base)->chip_data);
 +	regmap_del_irq_chip(da9052->chip_irq, da9052->irq_data);
  	mfd_remove_devices(da9052->dev);
  }