From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Linus <torvalds@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] spi: update for of_device to platform_device replacement
Date: Sun, 15 Aug 2010 23:22:36 -0600 [thread overview]
Message-ID: <df0c23b2-b602-4555-a363-795deb0cde28@email.android.com> (raw)
In-Reply-To: <20100816122059.c3ee7f6a.sfr@canb.auug.org.au>
"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.
next prev parent reply other threads:[~2010-08-16 5:22 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
2010-08-16 2:20 ` [PATCH] spi: update for of_device to platform_device replacement Stephen Rothwell
2010-08-16 5:22 ` Grant Likely [this message]
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=df0c23b2-b602-4555-a363-795deb0cde28@email.android.com \
--to=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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®