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

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ti / wl1251 / spi.c

diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c
index 3b266d3231a36a538a6c17673c3d9ae18696795f..4c67c2f9ea716a1c8d9430bcd51284867a20a4c8 100644 (file)
--- a/drivers/net/wireless/ti/wl1251/spi.c
+++ b/drivers/net/wireless/ti/wl1251/spi.c
@@ -257,7 +257,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
        wl = hw->priv;
 
        SET_IEEE80211_DEV(hw, &spi->dev);
-       dev_set_drvdata(&spi->dev, wl);
+       spi_set_drvdata(spi, wl);
        wl->if_priv = spi;
        wl->if_ops = &wl1251_spi_ops;
 
@@ -311,7 +311,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
 
 static int wl1251_spi_remove(struct spi_device *spi)
 {
-       struct wl1251 *wl = dev_get_drvdata(&spi->dev);
+       struct wl1251 *wl = spi_get_drvdata(spi);
 
        free_irq(wl->irq, wl);
        wl1251_free_hw(wl);