net: ipv6: Add IPv6 support to the ping socket.

[mirror_ubuntu-artful-kernel.git] / drivers / mfd / wm831x-spi.c

diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 4e70e157a9090574fc6ca552aa5d99b778e994de..e7ed14f661d8eb1360d7974ae0bf64ec90ea0401 100644 (file)
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -37,7 +37,7 @@ static int wm831x_spi_probe(struct spi_device *spi)
        spi->bits_per_word = 16;
        spi->mode = SPI_MODE_0;
 
-       dev_set_drvdata(&spi->dev, wm831x);
+       spi_set_drvdata(spi, wm831x);
        wm831x->dev = &spi->dev;
 
        wm831x->regmap = devm_regmap_init_spi(spi, &wm831x_regmap_config);
@@ -53,7 +53,7 @@ static int wm831x_spi_probe(struct spi_device *spi)
 
 static int wm831x_spi_remove(struct spi_device *spi)
 {
-       struct wm831x *wm831x = dev_get_drvdata(&spi->dev);
+       struct wm831x *wm831x = spi_get_drvdata(spi);
 
        wm831x_device_exit(wm831x);
 
@@ -69,7 +69,7 @@ static int wm831x_spi_suspend(struct device *dev)
 
 static void wm831x_spi_shutdown(struct spi_device *spi)
 {
-       struct wm831x *wm831x = dev_get_drvdata(&spi->dev);
+       struct wm831x *wm831x = spi_get_drvdata(spi);
 
        wm831x_device_shutdown(wm831x);
 }