From: Grant Likely <grant.likely@secretlab•ca>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Anatolij Gustschin <agust@denx•de>
Subject: Re: linux-next: manual merge of the spi tree with the devicetree tree
Date: Sun, 08 Aug 2010 20:59:51 -0600 [thread overview]
Message-ID: <1aa23ac2-1958-47e9-9697-1ec47baab366@email.android.com> (raw)
In-Reply-To: <20100809120509.be36a4fa.sfr@canb.auug.org.au>
"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.
next prev parent reply other threads:[~2010-08-09 2:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
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=1aa23ac2-1958-47e9-9697-1ec47baab366@email.android.com \
--to=grant.likely@secretlab$(echo .)ca \
--cc=agust@denx$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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