From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bill Pemberton <wfp5p@virginia.edu>,
Lee Jones <lee.jones@linaro.org>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: linux-next: manual merge of the driver-core tree with the mfd tree
Date: Thu, 29 Nov 2012 14:47:12 +1100 [thread overview]
Message-ID: <20121129144712.d6fcfdc94dbdd6f2d4bc7e79@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3130 bytes --]
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@canb.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);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-11-29 3:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-29 3:47 Stephen Rothwell [this message]
2012-11-29 5:20 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 4:24 Stephen Rothwell
2014-11-10 4:39 ` Greg KH
2012-11-29 4:18 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:00 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:57 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:50 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:43 Stephen Rothwell
2012-11-29 5:21 ` Greg KH
2010-09-14 2:25 Stephen Rothwell
2010-09-14 4:09 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121129144712.d6fcfdc94dbdd6f2d4bc7e79@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=wfp5p@virginia.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®