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: <20121129144712.d6fcfdc94dbdd6f2d4bc7e79@canb.auug.org.au>
Date:	Thu, 29 Nov 2012 14:47:12 +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>,
	Lee Jones <lee.jones@...aro.org>,
	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/mfd/ab8500-core.c between commit 8ae754ebd5ed ("mfd: ab8500-core:
Remove unused ab8500-gpio IRQ ranges") from the mfd tree and commit
a9e9ce4c4167 ("mfd: remove use of __devinitdata") 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/mfd/ab8500-core.c
index 3385db6,127b00a..0000000
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@@ -591,7 -591,39 +591,7 @@@ int ab8500_suspend(struct ab8500 *ab850
  		return 0;
  }
  
- static struct resource __devinitdata ab8500_gpadc_resources[] = {
 -/* AB8500 GPIO Resources */
 -static struct resource __devinitdata ab8500_gpio_resources[] = {
 -	{
 -		.name	= "GPIO_INT6",
 -		.start	= AB8500_INT_GPIO6R,
 -		.end	= AB8500_INT_GPIO41F,
 -		.flags	= IORESOURCE_IRQ,
 -	}
 -};
 -
 -/* AB9540 GPIO Resources */
 -static struct resource __devinitdata ab9540_gpio_resources[] = {
 -	{
 -		.name	= "GPIO_INT6",
 -		.start	= AB8500_INT_GPIO6R,
 -		.end	= AB8500_INT_GPIO41F,
 -		.flags	= IORESOURCE_IRQ,
 -	},
 -	{
 -		.name	= "GPIO_INT14",
 -		.start	= AB9540_INT_GPIO50R,
 -		.end	= AB9540_INT_GPIO54R,
 -		.flags	= IORESOURCE_IRQ,
 -	},
 -	{
 -		.name	= "GPIO_INT15",
 -		.start	= AB9540_INT_GPIO50F,
 -		.end	= AB9540_INT_GPIO54F,
 -		.flags	= IORESOURCE_IRQ,
 -	}
 -};
 -
+ static struct resource ab8500_gpadc_resources[] = {
  	{
  		.name	= "HW_CONV_END",
  		.start	= AB8500_INT_GP_HW_ADC_CONV_END,
@@@ -1010,16 -1038,11 +1010,16 @@@ static struct mfd_cell abx500_common_de
  	},
  };
  
- static struct mfd_cell __devinitdata ab8500_bm_devs[] = {
+ static struct mfd_cell ab8500_bm_devs[] = {
  	{
  		.name = "ab8500-charger",
 +		.of_compatible = "stericsson,ab8500-charger",
  		.num_resources = ARRAY_SIZE(ab8500_charger_resources),
  		.resources = ab8500_charger_resources,
 +#ifndef CONFIG_OF
 +		.platform_data = &ab8500_bm_data,
 +		.pdata_size = sizeof(ab8500_bm_data),
 +#endif
  	},
  	{
  		.name = "ab8500-btemp",
@@@ -1070,9 -1080,11 +1070,9 @@@ static struct mfd_cell ab8500_devs[] = 
  	},
  };
  
- static struct mfd_cell __devinitdata ab9540_devs[] = {
+ static struct mfd_cell ab9540_devs[] = {
  	{
  		.name = "ab8500-gpio",
 -		.num_resources = ARRAY_SIZE(ab9540_gpio_resources),
 -		.resources = ab9540_gpio_resources,
  	},
  	{
  		.name = "ab9540-usb",
@@@ -1445,9 -1460,20 +1445,9 @@@ static int ab8500_probe(struct platform
  		dev_err(ab8500->dev, "error creating sysfs entries\n");
  
  	return ret;
 -
 -out_freeirq:
 -	free_irq(ab8500->irq, ab8500);
 -out_freeoldmask:
 -	kfree(ab8500->oldmask);
 -out_freemask:
 -	kfree(ab8500->mask);
 -out_free_ab8500:
 -	kfree(ab8500);
 -
 -	return ret;
  }
  
- static int __devexit ab8500_remove(struct platform_device *pdev)
+ static int ab8500_remove(struct platform_device *pdev)
  {
  	struct ab8500 *ab8500 = platform_get_drvdata(pdev);
  

Content of type "application/pgp-signature" skipped