linux-next: manual merge of the spi tree with the devicetree tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
 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@xxxxxxxxxxxxxxxx

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);
  }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/