linux-kernel - linux-next: manual merge of the driver-core tree with the mfd tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121129151804.a133338f9738b25d3ccf2e6f@canb.auug.org.au>
Date:	Thu, 29 Nov 2012 15:18:04 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bill Pemberton <wfp5p@...ginia.edu>,
	Fabio Estevam <fabio.estevam@...escale.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the driver-core tree with the mfd tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/power/da9052-battery.c between commit 4b5edf7887c6 ("power:
da9052-battery: Convert to the new da9052 interrupt functions") from the
mfd tree and commit c8afa6406e60 ("power: remove use of __devinit") from
the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/power/da9052-battery.c
index 3972dc0,bb0df89..0000000
--- a/drivers/power/da9052-battery.c
+++ b/drivers/power/da9052-battery.c
@@@ -578,16 -576,7 +578,16 @@@ static char *da9052_bat_irqs[] = 
  	"CHG END",
  };
  
 +static int da9052_bat_irq_bits[] = {
 +	DA9052_IRQ_TBAT,
 +	DA9052_IRQ_DCIN,
 +	DA9052_IRQ_DCINREM,
 +	DA9052_IRQ_VBUS,
 +	DA9052_IRQ_VBUSREM,
 +	DA9052_IRQ_CHGEND,
 +};
 +
- static s32 __devinit da9052_bat_probe(struct platform_device *pdev)
+ static s32 da9052_bat_probe(struct platform_device *pdev)
  {
  	struct da9052_pdata *pdata;
  	struct da9052_battery *bat;
@@@ -638,14 -630,16 +638,14 @@@ err
  	kfree(bat);
  	return ret;
  }
- static int __devexit da9052_bat_remove(struct platform_device *pdev)
+ static int da9052_bat_remove(struct platform_device *pdev)
  {
  	int i;
 -	int irq;
  	struct da9052_battery *bat = platform_get_drvdata(pdev);
  
 -	for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++) {
 -		irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]);
 -		free_irq(bat->da9052->irq_base + irq, bat);
 -	}
 +	for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++)
 +		da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
 +
  	power_supply_unregister(&bat->psy);
  	kfree(bat);
  

Content of type "application/pgp-signature" skipped