* linux-next: manual merge of the spi tree with the devicetree tree
@ 2010-08-09 2:05 Stephen Rothwell
2010-08-09 2:59 ` Grant Likely
2010-08-16 2:20 ` [PATCH] spi: update for of_device to platform_device replacement Stephen Rothwell
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2010-08-09 2:05 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Anatolij Gustschin
Hi Grant,
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/mpc512x_psc_spi.c between commit
2dc11581376829303b98eadb2de253bee065a56a ("of/device: Replace struct
of_device with struct platform_device") from the devicetree tree and
commit cf40f082f8d3a98e28af02af20d00d2500eb6a65 ("spi/mpc5121: change
annotations for probe and remove functions") from the spi tree.
I fixed it up (as suggested by you - see below) and can carry the fix as
necessary.
I also added this merge fix patch (as suggest by you):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 9 Aug 2010 12:02:19 +1000
Subject: [PATCH] spi: update for of_device to platform_device replacement
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/ata/sata_dwc_460ex.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index ea24c1e..2673a3d 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -1588,7 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = {
},
};
-static int sata_dwc_probe(struct of_device *ofdev,
+static int sata_dwc_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
struct sata_dwc_device *hsdev;
@@ -1702,7 +1702,7 @@ error_out:
return err;
}
-static int sata_dwc_remove(struct of_device *ofdev)
+static int sata_dwc_remove(struct platform_device *ofdev)
{
struct device *dev = &ofdev->dev;
struct ata_host *host = dev_get_drvdata(dev);
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/spi/mpc512x_psc_spi.c
index cddbfce,c8d69fc..0000000
--- a/drivers/spi/mpc512x_psc_spi.c
+++ b/drivers/spi/mpc512x_psc_spi.c
@@@ -507,8 -505,8 +507,8 @@@ static int __devexit mpc512x_psc_spi_do
return 0;
}
- static int __init mpc512x_psc_spi_of_probe(struct platform_device *op,
-static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,
- const struct of_device_id *match)
++static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op,
+ const struct of_device_id *match)
{
const u32 *regaddr_p;
u64 regaddr64, size64;
@@@ -539,7 -537,7 +539,7 @@@
irq_of_parse_and_map(op->dev.of_node, 0), id);
}
- static int __exit mpc512x_psc_spi_of_remove(struct platform_device *op)
-static int __devexit mpc512x_psc_spi_of_remove(struct of_device *op)
++static int __devexit mpc512x_psc_spi_of_remove(struct platform_device *op)
{
return mpc512x_psc_spi_do_remove(&op->dev);
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the spi tree with the devicetree tree
2010-08-09 2:05 linux-next: manual merge of the spi tree with the devicetree tree Stephen Rothwell
@ 2010-08-09 2:59 ` Grant Likely
2010-08-16 2:20 ` [PATCH] spi: update for of_device to platform_device replacement Stephen Rothwell
1 sibling, 0 replies; 5+ messages in thread
From: Grant Likely @ 2010-08-09 2:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Anatolij Gustschin
"Stephen Rothwell" <sfr@canb•auug.org.au> wrote:
>Hi Grant,
>
>Today's linux-next merge of the spi tree got a conflict in
>drivers/spi/mpc512x_psc_spi.c between commit
>2dc11581376829303b98eadb2de253bee065a56a ("of/device: Replace struct
>of_device with struct platform_device") from the devicetree tree and
>commit cf40f082f8d3a98e28af02af20d00d2500eb6a65 ("spi/mpc5121: change
>annotations for probe and remove functions") from the spi tree.
>
>I fixed it up (as suggested by you - see below) and can carry the fix as
>necessary.
>
>I also added this merge fix patch (as suggest by you):
Thanks Stephen.
g.
>
>From: Stephen Rothwell <sfr@canb•auug.org.au>
>Date: Mon, 9 Aug 2010 12:02:19 +1000
>Subject: [PATCH] spi: update for of_device to platform_device replacement
>
>Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
>---
> drivers/ata/sata_dwc_460ex.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
>index ea24c1e..2673a3d 100644
>--- a/drivers/ata/sata_dwc_460ex.c
>+++ b/drivers/ata/sata_dwc_460ex.c
>@@ -1588,7 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = {
> },
> };
>
>-static int sata_dwc_probe(struct of_device *ofdev,
>+static int sata_dwc_probe(struct platform_device *ofdev,
> const struct of_device_id *match)
> {
> struct sata_dwc_device *hsdev;
>@@ -1702,7 +1702,7 @@ error_out:
> return err;
> }
>
>-static int sata_dwc_remove(struct of_device *ofdev)
>+static int sata_dwc_remove(struct platform_device *ofdev)
> {
> struct device *dev = &ofdev->dev;
> struct ata_host *host = dev_get_drvdata(dev);
>--
>1.7.1
>
>--
>Cheers,
>Stephen Rothwell sfr@canb•auug.org.au
>
>diff --cc drivers/spi/mpc512x_psc_spi.c
>index cddbfce,c8d69fc..0000000
>--- a/drivers/spi/mpc512x_psc_spi.c
>+++ b/drivers/spi/mpc512x_psc_spi.c
>@@@ -507,8 -505,8 +507,8 @@@ static int __devexit mpc512x_psc_spi_do
> return 0;
> }
>
>- static int __init mpc512x_psc_spi_of_probe(struct platform_device *op,
> -static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,
> - const struct of_device_id *match)
>++static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op,
> + const struct of_device_id *match)
> {
> const u32 *regaddr_p;
> u64 regaddr64, size64;
>@@@ -539,7 -537,7 +539,7 @@@
> irq_of_parse_and_map(op->dev.of_node, 0), id);
> }
>
>- static int __exit mpc512x_psc_spi_of_remove(struct platform_device *op)
> -static int __devexit mpc512x_psc_spi_of_remove(struct of_device *op)
>++static int __devexit mpc512x_psc_spi_of_remove(struct platform_device *op)
> {
> return mpc512x_psc_spi_do_remove(&op->dev);
> }
--
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] spi: update for of_device to platform_device replacement
2010-08-09 2:05 linux-next: manual merge of the spi tree with the devicetree tree Stephen Rothwell
2010-08-09 2:59 ` Grant Likely
@ 2010-08-16 2:20 ` Stephen Rothwell
2010-08-16 5:22 ` Grant Likely
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2010-08-16 2:20 UTC (permalink / raw)
To: Grant Likely, Linus; +Cc: linux-next, linux-kernel
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/ata/sata_dwc_460ex.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Hi Grant,
On Mon, 9 Aug 2010 12:05:09 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> I also added this merge fix patch (as suggest by you):
This patch now is needed in Linus' tree. I will add it to my fixes tree
for today. Linus, can you take this, please?
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index ea24c1e..2673a3d 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -1588,7 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = {
},
};
-static int sata_dwc_probe(struct of_device *ofdev,
+static int sata_dwc_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
struct sata_dwc_device *hsdev;
@@ -1702,7 +1702,7 @@ error_out:
return err;
}
-static int sata_dwc_remove(struct of_device *ofdev)
+static int sata_dwc_remove(struct platform_device *ofdev)
{
struct device *dev = &ofdev->dev;
struct ata_host *host = dev_get_drvdata(dev);
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] spi: update for of_device to platform_device replacement
2010-08-16 2:20 ` [PATCH] spi: update for of_device to platform_device replacement Stephen Rothwell
@ 2010-08-16 5:22 ` Grant Likely
2010-08-16 21:19 ` Grant Likely
0 siblings, 1 reply; 5+ messages in thread
From: Grant Likely @ 2010-08-16 5:22 UTC (permalink / raw)
To: Stephen Rothwell, Linus; +Cc: linux-next, linux-kernel
"Stephen Rothwell" <sfr@canb•auug.org.au> wrote:
>
>Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
Acked-by: Grant Likely <grant.likely@secretlab•ca>
>---
> drivers/ata/sata_dwc_460ex.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>Hi Grant,
>
>On Mon, 9 Aug 2010 12:05:09 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>
>> I also added this merge fix patch (as suggest by you):
>
>This patch now is needed in Linus' tree. I will add it to my fixes tree
>for today. Linus, can you take this, please?
>
>diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
>index ea24c1e..2673a3d 100644
>--- a/drivers/ata/sata_dwc_460ex.c
>+++ b/drivers/ata/sata_dwc_460ex.c
>@@ -1588,7 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = {
> },
> };
>
>-static int sata_dwc_probe(struct of_device *ofdev,
>+static int sata_dwc_probe(struct platform_device *ofdev,
> const struct of_device_id *match)
> {
> struct sata_dwc_device *hsdev;
>@@ -1702,7 +1702,7 @@ error_out:
> return err;
> }
>
>-static int sata_dwc_remove(struct of_device *ofdev)
>+static int sata_dwc_remove(struct platform_device *ofdev)
> {
> struct device *dev = &ofdev->dev;
> struct ata_host *host = dev_get_drvdata(dev);
>--
>1.7.1
>
>--
>Cheers,
>Stephen Rothwell sfr@canb•auug.org.au
>http://www.canb.auug.org.au/~sfr/
--
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] spi: update for of_device to platform_device replacement
2010-08-16 5:22 ` Grant Likely
@ 2010-08-16 21:19 ` Grant Likely
0 siblings, 0 replies; 5+ messages in thread
From: Grant Likely @ 2010-08-16 21:19 UTC (permalink / raw)
To: Stephen Rothwell, Linus; +Cc: linux-next, linux-kernel
On Sun, Aug 15, 2010 at 11:22 PM, Grant Likely
<grant.likely@secretlab•ca> wrote:
>
>
> "Stephen Rothwell" <sfr@canb•auug.org.au> wrote:
>
>>
>>Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
>
>>This patch now is needed in Linus' tree. I will add it to my fixes tree
>>for today. Linus, can you take this, please?
Linus, I'm collecting a number of OF-related fixup patches anyway, so
I'll pick this up into my tree, make sure I haven't broken anything,
and send you a pull req this afternoon.
Cheers,
g.
>>
>>diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
>>index ea24c1e..2673a3d 100644
>>--- a/drivers/ata/sata_dwc_460ex.c
>>+++ b/drivers/ata/sata_dwc_460ex.c
>>@@ -1588,7 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = {
>> },
>> };
>>
>>-static int sata_dwc_probe(struct of_device *ofdev,
>>+static int sata_dwc_probe(struct platform_device *ofdev,
>> const struct of_device_id *match)
>> {
>> struct sata_dwc_device *hsdev;
>>@@ -1702,7 +1702,7 @@ error_out:
>> return err;
>> }
>>
>>-static int sata_dwc_remove(struct of_device *ofdev)
>>+static int sata_dwc_remove(struct platform_device *ofdev)
>> {
>> struct device *dev = &ofdev->dev;
>> struct ata_host *host = dev_get_drvdata(dev);
>>--
>>1.7.1
>>
>>--
>>Cheers,
>>Stephen Rothwell sfr@canb•auug.org.au
>>http://www.canb.auug.org.au/~sfr/
>
> --
> Sent from my Android phone with K-9 Mail. Please excuse my brevity.
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-08-16 21:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-09 2:05 linux-next: manual merge of the spi tree with the devicetree tree Stephen Rothwell
2010-08-09 2:59 ` Grant Likely
2010-08-16 2:20 ` [PATCH] spi: update for of_device to platform_device replacement Stephen Rothwell
2010-08-16 5:22 ` Grant Likely
2010-08-16 21:19 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox