Merge remote branch 'origin' into secretlab/next-spi

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index 6e7aabe8db18..ffa111a7e9d4 100644
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -678,7 +678,7 @@ static int mpc8xxx_spi_setup(struct spi_device *spi)
         }
         mpc8xxx_spi = spi_master_get_devdata(spi->master);
 
-        hw_mode = cs->hw_mode; /* Save orginal settings */
+        hw_mode = cs->hw_mode; /* Save original settings */
         cs->hw_mode = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode);
         /* mask out bits we are going to set */
         cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH
@@ -835,7 +835,7 @@ static void mpc8xxx_spi_free_dummy_rx(void)
 static unsigned long mpc8xxx_spi_cpm_get_pram(struct mpc8xxx_spi *mspi)
 {
         struct device *dev = mspi->dev;
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
         const u32 *iprop;
         int size;
         unsigned long spi_base_ofs;
@@ -889,7 +889,7 @@ static unsigned long mpc8xxx_spi_cpm_get_pram(struct mpc8xxx_spi *mspi)
 static int mpc8xxx_spi_cpm_init(struct mpc8xxx_spi *mspi)
 {
         struct device *dev = mspi->dev;
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
         const u32 *iprop;
         int size;
         unsigned long pram_ofs;
@@ -1161,7 +1161,7 @@ static void mpc8xxx_spi_cs_control(struct spi_device *spi, bool on)
 
 static int of_mpc8xxx_spi_get_chipselects(struct device *dev)
 {
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
         struct fsl_spi_platform_data *pdata = dev->platform_data;
         struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);
         unsigned int ngpios;
@@ -1262,7 +1262,7 @@ static int __devinit of_mpc8xxx_spi_probe(struct of_device *ofdev,
                                           const struct of_device_id *ofid)
 {
         struct device *dev = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct mpc8xxx_spi_probe_info *pinfo;
         struct fsl_spi_platform_data *pdata;
         struct spi_master *master;
@@ -1350,8 +1350,11 @@ static const struct of_device_id of_mpc8xxx_spi_match[] = {
 MODULE_DEVICE_TABLE(of, of_mpc8xxx_spi_match);
 
 static struct of_platform_driver of_mpc8xxx_spi_driver = {
-        .name           = "mpc8xxx_spi",
-        .match_table    = of_mpc8xxx_spi_match,
+        .driver = {
+                .name = "mpc8xxx_spi",
+                .owner = THIS_MODULE,
+                .of_match_table = of_mpc8xxx_spi_match,
+        },
         .probe          = of_mpc8xxx_spi_probe,
         .remove         = __devexit_p(of_mpc8xxx_spi_remove),
 };