2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 1ad12afc6ba0..1771b2456bfa 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -502,7 +502,7 @@ struct spi_master *spi_busnum_to_master(u16 bus_num)
         struct device           *dev;
         struct spi_master       *master = NULL;
 
-        dev = class_find_device(&spi_master_class, &bus_num,
+        dev = class_find_device(&spi_master_class, NULL, &bus_num,
                                 __spi_master_match);
         if (dev)
                 master = container_of(dev, struct spi_master, dev);
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index ddbe1a5e970e..2833fd772a24 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -576,7 +576,8 @@ static int spidev_probe(struct spi_device *spi)
                 struct device *dev;
 
                 spidev->devt = MKDEV(SPIDEV_MAJOR, minor);
-                dev = device_create(spidev_class, &spi->dev, spidev->devt,
+                dev = device_create_drvdata(spidev_class, &spi->dev,
+                                spidev->devt, spidev,
                                 "spidev%d.%d",
                                 spi->master->bus_num, spi->chip_select);
                 status = IS_ERR(dev) ? PTR_ERR(dev) : 0;
@@ -586,7 +587,6 @@ static int spidev_probe(struct spi_device *spi)
         }
         if (status == 0) {
                 set_bit(minor, minors);
-                spi_set_drvdata(spi, spidev);
                 list_add(&spidev->device_entry, &device_list);
         }
         mutex_unlock(&device_list_lock);