Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / phy / spi_ks8995.c

diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 41eb8ffeb53d72b4357a02782238e0c34bdb42f7..d11c93e69e03fafac4efee44cad6c47e55380dda 100644 (file)
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -275,15 +275,13 @@ static int ks8995_probe(struct spi_device *spi)
        pdata = spi->dev.platform_data;
 
        ks = kzalloc(sizeof(*ks), GFP_KERNEL);
-       if (!ks) {
-               dev_err(&spi->dev, "no memory for private data\n");
+       if (!ks)
                return -ENOMEM;
-       }
 
        mutex_init(&ks->lock);
        ks->pdata = pdata;
        ks->spi = spi_dev_get(spi);
-       dev_set_drvdata(&spi->dev, ks);
+       spi_set_drvdata(spi, ks);
 
        spi->mode = SPI_MODE_0;
        spi->bits_per_word = 8;
@@ -327,7 +325,7 @@ static int ks8995_probe(struct spi_device *spi)
        return 0;
 
 err_drvdata:
-       dev_set_drvdata(&spi->dev, NULL);
+       spi_set_drvdata(spi, NULL);
        kfree(ks);
        return err;
 }
@@ -336,10 +334,10 @@ static int ks8995_remove(struct spi_device *spi)
 {
        struct ks8995_data      *ks8995;
 
-       ks8995 = dev_get_drvdata(&spi->dev);
+       ks8995 = spi_get_drvdata(spi);
        sysfs_remove_bin_file(&spi->dev.kobj, &ks8995_registers_attr);
 
-       dev_set_drvdata(&spi->dev, NULL);
+       spi_set_drvdata(spi, NULL);
        kfree(ks8995);
 
        return 0;