1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index bcb8dd5fb0b4..89769ce16f88 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -204,7 +204,7 @@ struct spi_device *spi_new_device(struct spi_master *master,
                                   struct spi_board_info *chip)
 {
         struct spi_device       *proxy;
-        struct device           *dev = master->cdev.dev;
+        struct device           *dev = master->dev.parent;
         int                     status;
 
         /* NOTE:  caller did any chip->bus_num checks necessary.
@@ -239,7 +239,7 @@ struct spi_device *spi_new_device(struct spi_master *master,
         proxy->modalias = chip->modalias;
 
         snprintf(proxy->dev.bus_id, sizeof proxy->dev.bus_id,
-                        "%s.%u", master->cdev.class_id,
+                        "%s.%u", master->dev.bus_id,
                         chip->chip_select);
         proxy->dev.parent = dev;
         proxy->dev.bus = &spi_bus_type;
@@ -338,18 +338,18 @@ static void scan_boardinfo(struct spi_master *master)
 
 /*-------------------------------------------------------------------------*/
 
-static void spi_master_release(struct class_device *cdev)
+static void spi_master_release(struct device *dev)
 {
         struct spi_master *master;
 
-        master = container_of(cdev, struct spi_master, cdev);
+        master = container_of(dev, struct spi_master, dev);
         kfree(master);
 }
 
 static struct class spi_master_class = {
         .name           = "spi_master",
         .owner          = THIS_MODULE,
-        .release        = spi_master_release,
+        .dev_release    = spi_master_release,
 };
 
 
@@ -357,7 +357,7 @@ static struct class spi_master_class = {
  * spi_alloc_master - allocate SPI master controller
  * @dev: the controller, possibly using the platform_bus
  * @size: how much zeroed driver-private data to allocate; the pointer to this
- *      memory is in the class_data field of the returned class_device,
+ *      memory is in the driver_data field of the returned device,
  *      accessible with spi_master_get_devdata().
  * Context: can sleep
  *
@@ -383,9 +383,9 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
         if (!master)
                 return NULL;
 
-        class_device_initialize(&master->cdev);
-        master->cdev.class = &spi_master_class;
-        master->cdev.dev = get_device(dev);
+        device_initialize(&master->dev);
+        master->dev.class = &spi_master_class;
+        master->dev.parent = get_device(dev);
         spi_master_set_devdata(master, &master[1]);
 
         return master;
@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master);
 int spi_register_master(struct spi_master *master)
 {
         static atomic_t         dyn_bus_id = ATOMIC_INIT((1<<15) - 1);
-        struct device           *dev = master->cdev.dev;
+        struct device           *dev = master->dev.parent;
         int                     status = -ENODEV;
         int                     dynamic = 0;
 
@@ -440,12 +440,12 @@ int spi_register_master(struct spi_master *master)
         /* register the device, then userspace will see it.
          * registration fails if the bus ID is in use.
          */
-        snprintf(master->cdev.class_id, sizeof master->cdev.class_id,
+        snprintf(master->dev.bus_id, sizeof master->dev.bus_id,
                 "spi%u", master->bus_num);
-        status = class_device_add(&master->cdev);
+        status = device_add(&master->dev);
         if (status < 0)
                 goto done;
-        dev_dbg(dev, "registered master %s%s\n", master->cdev.class_id,
+        dev_dbg(dev, "registered master %s%s\n", master->dev.bus_id,
                         dynamic ? " (dynamic)" : "");
 
         /* populate children from any spi device tables */
@@ -478,8 +478,8 @@ void spi_unregister_master(struct spi_master *master)
 {
         int dummy;
 
-        dummy = device_for_each_child(master->cdev.dev, NULL, __unregister);
-        class_device_unregister(&master->cdev);
+        dummy = device_for_each_child(master->dev.parent, NULL, __unregister);
+        device_unregister(&master->dev);
 }
 EXPORT_SYMBOL_GPL(spi_unregister_master);
 
@@ -495,13 +495,13 @@ EXPORT_SYMBOL_GPL(spi_unregister_master);
  */
 struct spi_master *spi_busnum_to_master(u16 bus_num)
 {
-        struct class_device     *cdev;
+        struct device           *dev;
         struct spi_master       *master = NULL;
         struct spi_master       *m;
 
         down(&spi_master_class.sem);
-        list_for_each_entry(cdev, &spi_master_class.children, node) {
-                m = container_of(cdev, struct spi_master, cdev);
+        list_for_each_entry(dev, &spi_master_class.children, node) {
+                m = container_of(dev, struct spi_master, dev);
                 if (m->bus_num == bus_num) {
                         master = spi_master_get(m);
                         break;