Messages in this thread | | | Subject | Re: [PATCH] spi: update for of_device to platform_device replacement | From | Grant Likely <> | Date | Sun, 15 Aug 2010 23:22:36 -0600 |
| |
"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.
| |